diff --git a/changelog.rst b/changelog.rst
index 4d2f529b2..5e9f20b43 100644
--- a/changelog.rst
+++ b/changelog.rst
@@ -1,3 +1,10 @@
+Upcoming (TBD)
+==============
+
+Bug fixes:
+----------
+* Restore cursor shape behaviour for Emacs mode
+
 4.5.0 (2026-06-02)
 ==================
 
diff --git a/pgcli/main.py b/pgcli/main.py
index ad01a46fd..08b8be181 100644
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -1099,7 +1099,7 @@ def get_continuation(width, line_number, is_soft_wrap):
                 enable_suspend=True,
                 editing_mode=EditingMode.VI if self.vi_mode else EditingMode.EMACS,
                 search_ignore_case=True,
-                cursor=ModalCursorShapeConfig(),
+                cursor=ModalCursorShapeConfig() if self.vi_mode else None,
             )
 
             return prompt_app