diff --git a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
index 36880fa94..d9bc5e26c 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
+++ b/app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
@@ -1526,7 +1526,14 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     View tabSwitcher = menu.findItem(R.id.menu_tab_switcher).getActionView();
     tabSwitcherIcon = tabSwitcher.findViewById(R.id.ic_tab_switcher_text);
     updateTabSwitcherIcon();
-    tabSwitcher.setOnClickListener(v -> showTabSwitcher());
+    tabSwitcher.setOnClickListener(v -> {
+      if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
+        hideTabSwitcher();
+        selectTab(currentWebViewIndex);
+      } else {
+        showTabSwitcher();
+      }
+    });
     return true;
   }