diff --git a/quickshell/Modals/Clipboard/ClipboardHeader.qml b/quickshell/Modals/Clipboard/ClipboardHeader.qml
index d614c1ca..89372806 100644
--- a/quickshell/Modals/Clipboard/ClipboardHeader.qml
+++ b/quickshell/Modals/Clipboard/ClipboardHeader.qml
@@ -50,7 +50,7 @@ Item {
             iconSize: Theme.iconSize - 4
             iconColor: header.activeTab === "saved" ? Theme.primary : Theme.surfaceText
             backgroundColor: header.activeTab === "saved" ? Theme.primarySelected : "transparent"
-            visible: header.pinnedCount > 0
+            visible: header.pinnedCount > 0 || header.activeTab === "saved"
             tooltipText: header.activeTab === "saved" ? I18n.tr("Recent") : I18n.tr("Saved")
             onClicked: tabChanged(header.activeTab === "saved" ? "recents" : "saved")
         }
diff --git a/quickshell/Modals/Clipboard/ClipboardHistoryContent.qml b/quickshell/Modals/Clipboard/ClipboardHistoryContent.qml
index d7c89c49..aa156e39 100644
--- a/quickshell/Modals/Clipboard/ClipboardHistoryContent.qml
+++ b/quickshell/Modals/Clipboard/ClipboardHistoryContent.qml
@@ -36,9 +36,18 @@ FocusScope {
     signal instantCloseRequested
 
     onActiveTabChanged: {
+        if (activeTab === "saved" && pinnedCount === 0) {
+            activeTab = "recents";
+            return;
+        }
         ClipboardService.selectedIndex = 0;
         ClipboardService.keyboardNavigationActive = false;
     }
+    onPinnedCountChanged: {
+        if (activeTab === "saved" && pinnedCount === 0) {
+            activeTab = "recents";
+        }
+    }
     onSearchTextChanged: ClipboardService.searchText = searchText
 
     function hide() {