diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
index b4f474d42..2bbfb0440 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/Windows.java
@@ -742,10 +742,8 @@ public void restoreSessions() {
                     if (windowState.tabIndex >= 0 && windowState.tabIndex < restoredSessions.size()) {
                         Session defaultSession = targetWindow.getSession();
                         Session session = restoredSessions.get(windowState.tabIndex);
-                        targetWindow.setupListeners(session);
+                        targetWindow.setSession(session, WindowWidget.DEACTIVATE_CURRENT_SESSION);
                         session.setActive(true);
-                        targetWindow.setSession(session);
-                        SessionStore.get().setActiveSession(session);
                         // Destroy the default blank session
                         SessionStore.get().destroySession(defaultSession);