diff --git a/dpf b/dpf
index e030179..56a65f5 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit e03017963d4e98cb898a6a1b435ad2ca5bccb537
+Subproject commit 56a65f56a369e5b031aac5bbfb5999e974e32fad
diff --git a/src/override/Window.cpp b/src/override/Window.cpp
index 7ffaeea..4e41e83 100644
--- a/src/override/Window.cpp
+++ b/src/override/Window.cpp
@@ -283,7 +283,6 @@ void WindowSetPluginUI(Window* const window, DISTRHO_NAMESPACE::UI* const ui)
 		nvgDeleteGL2(window->internal->r_fbVg);
 #endif
 
-		// window->internal->hiddenWindow.close();
 		window->internal->ui = nullptr;
 		window->internal->callback = nullptr;
 	}
@@ -297,6 +296,8 @@ void WindowSetMods(Window* const window, const int mods)
 Window::~Window() {
 	{
 		DGL_NAMESPACE::Window::ScopedGraphicsContext sgc(internal->hiddenWindow);
+		internal->hiddenWindow.close();
+		internal->hiddenApp.idle();
 
 		// Fonts and Images in the cache must be deleted before the NanoVG context is deleted
 		internal->fontCache.clear();