diff --git a/qt/aqt/sidebar.py b/qt/aqt/sidebar.py
index 0685683fd..d54887332 100644
--- a/qt/aqt/sidebar.py
+++ b/qt/aqt/sidebar.py
@@ -591,12 +591,6 @@ class SidebarTreeView(QTreeView):
         type = SidebarItemType.FLAG
         search = self._filter_func
 
-        root.add_simple(
-            TR.BROWSING_CURRENT_DECK,
-            icon=icon,
-            type=type,
-            on_click=search(SearchTerm(deck="current")),
-        )
         root.add_simple(
             name=TR.BROWSING_SIDEBAR_DUE_TODAY,
             icon=icon,
@@ -814,6 +808,14 @@ class SidebarTreeView(QTreeView):
             collapse_key=Config.Bool.COLLAPSE_DECKS,
             type=SidebarItemType.DECK_ROOT,
         )
+        root.on_click = self._filter_func(SearchTerm(deck="*"))
+        root.add_simple(
+            name=tr(TR.BROWSING_CURRENT_DECK),
+            icon=icon,
+            type=SidebarItemType.DECK,
+            on_click=self._filter_func(SearchTerm(deck="current")),
+        )
+
         render(root, tree.children)
 
     # Tree: Notetypes
diff --git a/rslib/src/backend/mod.rs b/rslib/src/backend/mod.rs
index 535d4e251..265675f24 100644
--- a/rslib/src/backend/mod.rs
+++ b/rslib/src/backend/mod.rs
@@ -304,7 +304,12 @@ impl From<pb::SearchTerm> for Node<'_> {
                     escape_anki_wildcards(&s).into_owned().into(),
                 )),
                 Filter::Deck(s) => Node::Search(SearchNode::Deck(
-                    escape_anki_wildcards(&s).into_owned().into(),
+                    if s == "*" {
+                        s
+                    } else {
+                        escape_anki_wildcards(&s).into_owned()
+                    }
+                    .into(),
                 )),
                 Filter::Note(s) => Node::Search(SearchNode::NoteType(
                     escape_anki_wildcards(&s).into_owned().into(),