diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 4d46530a..67da6b71 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -1069,9 +1069,10 @@ public class Application.MainWindow :
                 }
 
             }
+            this.previous_non_search_folder = null;
             if (to_select != null) {
                 this.select_folder.begin(
-                    this.previous_non_search_folder, is_interactive
+                    to_select, is_interactive
                 );
             } else {
                 select_first_inbox(is_interactive);