diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index 82b369bd0..75dbae7a6 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -12293,9 +12293,11 @@
         pageNum = view;
         view = 'index';
       }
-      Navigate.updateContext(view);
-      if (!(view === g.VIEW && boardID === g.BOARD.ID)) {
+      if (view === g.VIEW && boardID === g.BOARD.ID) {
+        Navigate.updateContext(view);
+      } else {
         Navigate.disconnect();
+        Navigate.updateContext(view);
         Navigate.clean();
         Navigate.reconnect();
       }
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 0b6a54afb..b2050c249 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -12282,9 +12282,11 @@
         pageNum = view;
         view = 'index';
       }
-      Navigate.updateContext(view);
-      if (!(view === g.VIEW && boardID === g.BOARD.ID)) {
+      if (view === g.VIEW && boardID === g.BOARD.ID) {
+        Navigate.updateContext(view);
+      } else {
         Navigate.disconnect();
+        Navigate.updateContext(view);
         Navigate.clean();
         Navigate.reconnect();
       }
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 594cb8fe6..e2d87ef7f 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -204,10 +204,11 @@ Navigate =
       pageNum = view
       view = 'index' # path is "/boardID/". See the problem?
 
-    Navigate.updateContext view
-
-    unless view is g.VIEW and boardID is g.BOARD.ID # We've navigated somewhere we weren't before!
+    if view is g.VIEW and boardID is g.BOARD.ID
+      Navigate.updateContext view
+    else # We've navigated somewhere we weren't before!
       Navigate.disconnect()
+      Navigate.updateContext view
       Navigate.clean()
       Navigate.reconnect()