diff --git a/panels/dock/tray/quickpanel/SubPluginPage.qml b/panels/dock/tray/quickpanel/SubPluginPage.qml
index 4a828462d..a9273411d 100644
--- a/panels/dock/tray/quickpanel/SubPluginPage.qml
+++ b/panels/dock/tray/quickpanel/SubPluginPage.qml
@@ -87,6 +87,10 @@ Item {
             id: surfaceLayer
             autoClose: true
             Layout.fillWidth: true
+
+            onSurfaceDestroyed: {
+                requestBack()
+            }
         }
 
         Item { Layout.fillHeight: true; Layout.preferredWidth: 1 }