diff --git a/rigpa-mode-mode.el b/rigpa-mode-mode.el
index ae6cb01..1a1b522 100644
--- a/rigpa-mode-mode.el
+++ b/rigpa-mode-mode.el
@@ -360,6 +360,7 @@ current editing tower."
   (let ((ref-buf (rigpa--get-ground-buffer)))
     (rigpa--revert-ui)
     (rigpa--remove-meta-side-effects)
+    (chimera--exit-mode (rigpa-current-mode))
     (when (eq (with-current-buffer ref-buf
                 (rigpa--get-ground-buffer))
               ref-buf)
diff --git a/rigpa-tower-mode.el b/rigpa-tower-mode.el
index 1674f58..190262a 100644
--- a/rigpa-tower-mode.el
+++ b/rigpa-tower-mode.el
@@ -236,6 +236,7 @@ initial editing tower."
       (setq rigpa--last-tower-index rigpa--tower-index-on-entry))
     (rigpa--revert-ui)
     (rigpa--remove-meta-tower-side-effects)
+    (chimera--exit-mode (rigpa-current-mode))
     (kill-matching-buffers (concat "^" rigpa-buffer-prefix) nil t)
     (switch-to-buffer ref-buf)))