diff --git a/core/core-helm.el b/core/core-helm.el
index d9dc8ad2d..43498e2d1 100644
--- a/core/core-helm.el
+++ b/core/core-helm.el
@@ -6,7 +6,6 @@
   (defvar helm-global-prompt "›")
   (setq-default
    helm-quick-update t
-   helm-reuse-last-window-split-state t
 
    ;; Speedier without fuzzy matching
    helm-mode-fuzzy-match nil
@@ -23,7 +22,6 @@
 
    ;; Don't override evil-ex's completion
    helm-mode-handle-completion-in-region nil
-
    helm-candidate-number-limit 40)
 
   :config
diff --git a/core/core-popup.el b/core/core-popup.el
index e91bd0423..919f49fa9 100644
--- a/core/core-popup.el
+++ b/core/core-popup.el
@@ -151,7 +151,8 @@
     ;; that. To reproduce, add a helm rule in `shackle-rules', open two splits
     ;; side-by-side, move to the buffer on the right and invoke helm. It will close all
     ;; but the left-most buffer.
-    (setq-default helm-split-window-in-side-p t))
+    (setq-default helm-reuse-last-window-split-state t
+                  helm-split-window-in-side-p t))
 
   (after! helm-swoop
     (setq helm-swoop-split-window-function (lambda ($buf) (narf/popup-buffer $buf))))