diff --git a/src/interface/emacs/khoj.el b/src/interface/emacs/khoj.el
index 6681cad9..b641dde3 100644
--- a/src/interface/emacs/khoj.el
+++ b/src/interface/emacs/khoj.el
@@ -738,28 +738,30 @@ Render results in BUFFER-NAME using search results, CONTENT-TYPE and (optional)
 
 (defun khoj--open-side-pane (buffer-name)
   "Open Khoj BUFFER-NAME in right side pane."
-  (if (get-buffer-window-list buffer-name)
-      ;; if window is already open, switch to it
-      (progn
-        (select-window (get-buffer-window buffer-name))
-        (switch-to-buffer buffer-name))
-    ;; else if window is not open, open it as a right-side window pane
-    (let ((bottomright-window (some-window (lambda (window) (and (window-at-side-p window 'right) (window-at-side-p window 'bottom))))))
-      (progn
-        ;; Select the right-most window
-        (select-window bottomright-window)
-        ;; if bottom-right window is not a vertical pane, split it vertically, else use the existing bottom-right vertical window
-        (let ((khoj-window (if (window-at-side-p bottomright-window 'left)
-                               (split-window-right)
-                             bottomright-window)))
-          ;; Set the buffer in the khoj window
-          (set-window-buffer khoj-window buffer-name)
-          ;; Switch to the khoj window
-          (select-window khoj-window)
-          ;; Resize the window to 1/3 of the frame width
-          (window-resize khoj-window
-                         (- (truncate (* 0.33 (frame-width))) (window-width))
-                         t))))))
+  (save-selected-window
+    (if (get-buffer-window-list buffer-name)
+        ;; if window is already open, switch to it
+        (progn
+          (select-window (get-buffer-window buffer-name))
+          (switch-to-buffer buffer-name))
+      ;; else if window is not open, open it as a right-side window pane
+      (let ((bottomright-window (some-window (lambda (window) (and (window-at-side-p window 'right) (window-at-side-p window 'bottom))))))
+        (progn
+          ;; Select the right-most window
+          (select-window bottomright-window)
+          ;; if bottom-right window is not a vertical pane, split it vertically, else use the existing bottom-right vertical window
+          (let ((khoj-window (if (window-at-side-p bottomright-window 'left)
+                                 (split-window-right)
+                               bottomright-window)))
+            ;; Set the buffer in the khoj window
+            (set-window-buffer khoj-window buffer-name)
+            ;; Switch to the khoj window
+            (select-window khoj-window)
+            ;; Resize the window to 1/3 of the frame width
+            (window-resize khoj-window
+                           (- (truncate (* 0.33 (frame-width))) (window-width))
+                           t)))))
+    (goto-char (point-min))))
 
 (defun khoj--load-chat-session (buffer-name &optional session-id)
   "Load Khoj Chat conversation history into BUFFER-NAME."
@@ -1162,8 +1164,7 @@ Paragraph only starts at first text after blank line."
        buffer-name
        rerank
        t)
-      (khoj--open-side-pane buffer-name)
-      (goto-char (point-min)))))
+      (khoj--open-side-pane buffer-name))))
 
 (defun khoj--auto-find-similar ()
   "Call find similar on current element, if point has moved to a new element."
@@ -1176,8 +1177,7 @@ Paragraph only starts at first text after blank line."
       (unless (eq current-heading-pos khoj--last-heading-pos)
         (progn
           (setq khoj--last-heading-pos current-heading-pos)
-          (save-excursion
-            (khoj--find-similar)))))))
+          (khoj--find-similar))))))
 
 (defun khoj--setup-auto-find-similar ()
   "Setup automatic call to find similar to current element."