diff --git a/core/core-helm.el b/core/core-helm.el
index 46904b381..73f184a7b 100644
--- a/core/core-helm.el
+++ b/core/core-helm.el
@@ -132,7 +132,6 @@
   :commands (helm-swoop helm-multi-swoop helm-multi-swoop-all)
   :config
   (setq helm-swoop-use-line-number-face t
-        helm-swoop-split-with-multiple-windows t
         helm-swoop-candidate-number-limit 200
         helm-swoop-speed-or-color t
         helm-swoop-pre-input-function (lambda () "")))
diff --git a/core/core-popup.el b/core/core-popup.el
index 5a4347e0f..d4b3909a1 100644
--- a/core/core-popup.el
+++ b/core/core-popup.el
@@ -61,6 +61,9 @@
     ;; but th left-most buffer.
     (setq-default helm-split-window-in-side-p t))
 
+  (after! helm-swoop
+    (setq helm-swoop-split-window-function (lambda ($buf) (narf/popup-buffer $buf))))
+
   (after! helm-ag
     ;; Helm-ag needs a little coaxing for it to cooperate with shackle. Mostly to prevent
     ;; it from switching between windows and buffers.