diff --git a/modules/app/irc/autoload/irc.el b/modules/app/irc/autoload/irc.el
index 420139f31..fa4a15a8d 100644
--- a/modules/app/irc/autoload/irc.el
+++ b/modules/app/irc/autoload/irc.el
@@ -62,7 +62,14 @@ argument) is non-nil only show channels in current server."
                          (cl-loop for buf in (circe-server-chat-buffers)
                                   unless (eq buf current-buffer)
                                   collect (format "  %s" (buffer-name buf)))))
-              :action #'ivy--switch-buffer-action
+              :action #'+irc--ivy-switch-to-buffer-action
               :preselect (buffer-name (current-buffer))
               :keymap ivy-switch-buffer-map
               :caller '+irc/ivy-jump-to-channel)))
+
+;;;###autoload
+(defun +irc--ivy-switch-to-buffer-action (buffer)
+  (when (stringp buffer)
+    (if (get-buffer buffer)
+        (ivy--switch-buffer-action buffer)
+      (ivy--switch-buffer-action (s-trim-left buffer)))))
diff --git a/modules/app/irc/config.el b/modules/app/irc/config.el
index 056124afa..19a876cdd 100644
--- a/modules/app/irc/config.el
+++ b/modules/app/irc/config.el
@@ -114,9 +114,14 @@ playback.")
     ;; Let `+irc/quit' and `circe' handle buffer cleanup
     (map! :map circe-mode-map [remap doom/kill-this-buffer] #'bury-buffer)
 
-    ;; Ensure entering insert mode will put us at the prompt.
+    ;; Ensure entering insert mode will put us at the prompt,
+    ;; unless editing after prompt marker.
+    (defun +irc-evil-insert ()
+      (when (> (marker-position lui-input-marker) (point))
+        (end-of-buffer)))
+
     (add-hook! 'lui-mode-hook
-      (add-hook 'evil-insert-state-entry-hook #'end-of-buffer nil t)))
+      (add-hook 'evil-insert-state-entry-hook #'+irc-evil-insert nil t)))
 
   (after! solaire-mode
     ;; distinguish chat/channel buffers from server buffers.