diff --git a/src/server-server.c b/src/server-server.c
index 39aa1b07..ff0c9037 100644
--- a/src/server-server.c
+++ b/src/server-server.c
@@ -237,6 +237,8 @@ remove_context_from_stack (ServerServer *server, ServerContext *context)
         g_slist_free1 (head);
         g_object_unref (context);
     }
+    if (server->context_stack)
+        server_context_set_enabled (server->context_stack->data, TRUE);
 }
 
 static void