diff --git a/Modules/Bar/ActiveWindow.qml b/Modules/Bar/ActiveWindow.qml
index 30276b9..257f47b 100644
--- a/Modules/Bar/ActiveWindow.qml
+++ b/Modules/Bar/ActiveWindow.qml
@@ -49,8 +49,13 @@ Row {
     if (!focusedWindow || !focusedWindow.appId)
       return ""
 
-    let icon = Quickshell.iconPath(DesktopEntries.byId(focusedWindow.appId).icon)
-    return icon || ""
+    // DesktopEntries.byId may return null for unknown apps; guard accordingly
+    if (typeof DesktopEntries === 'undefined' || !DesktopEntries.byId)
+      return ""
+    const entry = DesktopEntries.byId(focusedWindow.appId)
+    const iconName = entry && entry.icon ? entry.icon : ""
+    const iconPath = iconName ? Quickshell.iconPath(iconName) : ""
+    return iconPath || ""
   }
 
   //  A hidden text element to safely measure the full title width
diff --git a/Widgets/NPanel.qml b/Widgets/NPanel.qml
index 58b4c61..97a8705 100644
--- a/Widgets/NPanel.qml
+++ b/Widgets/NPanel.qml
@@ -117,7 +117,7 @@ Loader {
         sequences: ["Escape"]
         enabled: root.active && !root.isClosing
         onActivated: root.close()
-        context: Shortcut.WindowShortcut
+        context: Qt.WindowShortcut
       }
 
       // Clicking outside of the rectangle to close
@@ -158,8 +158,6 @@ Loader {
         Component.onCompleted: {
           root.scaleValue = 1.0
           root.opacityValue = 1.0
-          // Ensure the panel window becomes the active window so window-scoped shortcuts work (Esc)
-          Qt.callLater(() => panelWindow.forceActiveFocus())
         }
 
         // Prevent closing when clicking in the panel bg