diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
index 8844a7fde..96af24cfe 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -483,6 +483,14 @@ public void switchHistory() {
         }
     }
 
+    private void hideLibraryPanels() {
+        if (isBookmarksVisible()) {
+            hideBookmarks();
+        } else if (isHistoryVisible()) {
+            hideHistory();
+        }
+    }
+
     public void showHistory() {
         showHistory(true);
     }
@@ -1035,6 +1043,7 @@ public void setSession(@NonNull Session aSession) {
                 listener.onSessionChanged(oldSession, aSession);
             }
         }
+        hideLibraryPanels();
     }
 
     public void releaseDisplay(GeckoSession aSession) {