diff --git a/applets/systemtray/package/contents/ui/PlasmoidPopupsContainer.qml b/applets/systemtray/package/contents/ui/PlasmoidPopupsContainer.qml
index 44ab0ae74..3ea78728d 100644
--- a/applets/systemtray/package/contents/ui/PlasmoidPopupsContainer.qml
+++ b/applets/systemtray/package/contents/ui/PlasmoidPopupsContainer.qml
@@ -27,7 +27,6 @@ StackView {
     id: mainStack
     clip: true
     focus: true
-    Keys.forwardTo: [currentItem]
 
     Layout.minimumWidth: units.gridUnit * 12
     Layout.minimumHeight: units.gridUnit * 12
diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml
index 6d59b31ac..a608b242a 100644
--- a/applets/systemtray/package/contents/ui/main.qml
+++ b/applets/systemtray/package/contents/ui/main.qml
@@ -328,6 +328,7 @@ MouseArea {
         flags: Qt.WindowStaysOnTopHint
         location: plasmoid.location
         hideOnWindowDeactivate: expandedRepresentation.hideOnWindowDeactivate
+
         onVisibleChanged: {
             if (!visible) {
                 plasmoid.status = PlasmaCore.Types.PassiveStatus;
@@ -340,6 +341,11 @@ MouseArea {
         }
         mainItem: ExpandedRepresentation {
             id: expandedRepresentation
+
+            Keys.onEscapePressed: {
+                root.expanded = false;
+            }
+
             activeApplet: root.activeApplet
 
             LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft