diff --git a/.config/quickshell/modules/sidebarLeft/Anime.qml b/.config/quickshell/modules/sidebarLeft/Anime.qml
index a1beca59d..ff529219d 100644
--- a/.config/quickshell/modules/sidebarLeft/Anime.qml
+++ b/.config/quickshell/modules/sidebarLeft/Anime.qml
@@ -114,12 +114,6 @@ Item {
         }
     }
 
-    Connections {
-        target: panelWindow
-        function onVisibleChanged(visible) {
-            tagInputField.forceActiveFocus()
-        }
-    }
     onFocusChanged: (focus) => {
         if (focus) {
             tagInputField.forceActiveFocus()
diff --git a/.config/quickshell/modules/sidebarLeft/SidebarLeft.qml b/.config/quickshell/modules/sidebarLeft/SidebarLeft.qml
index eff535d61..2f1bad740 100644
--- a/.config/quickshell/modules/sidebarLeft/SidebarLeft.qml
+++ b/.config/quickshell/modules/sidebarLeft/SidebarLeft.qml
@@ -58,6 +58,9 @@ Scope { // Scope
                 id: grab
                 windows: [ sidebarRoot ]
                 active: sidebarRoot.visible && !sidebarRoot.pin
+                onActiveChanged: { // Focus the selected tab
+                    if (active) swipeView.currentItem.forceActiveFocus()
+                }
                 onCleared: () => {
                     if (!active) sidebarRoot.hide()
                 }