diff --git a/libs/gtkmm2ext/window_proxy.cc b/libs/gtkmm2ext/window_proxy.cc
index d8d92db69b..ac043d8986 100644
--- a/libs/gtkmm2ext/window_proxy.cc
+++ b/libs/gtkmm2ext/window_proxy.cc
@@ -202,11 +202,11 @@ void
 WindowProxy::drop_window ()
 {
 	if (_window) {
+		unmap_connection.disconnect ();
 		_window->hide ();
 		delete_connection.disconnect ();
 		configure_connection.disconnect ();
 		map_connection.disconnect ();
-		unmap_connection.disconnect ();
 		delete _window;
 		_window = 0;
 		delete vistracker;
@@ -228,8 +228,6 @@ WindowProxy::setup ()
 {
 	assert (_window);
 
-	assert (_window);
-
 	delete_connection.disconnect ();
 	configure_connection.disconnect ();
 	map_connection.disconnect ();