diff --git a/lispy-inline.el b/lispy-inline.el
index 61227649..fc38b4e4 100644
--- a/lispy-inline.el
+++ b/lispy-inline.el
@@ -109,7 +109,9 @@ The caller of `lispy--show' might use a substitute e.g. `describe-function'."
   :group 'lispy)
 
 (defvar lispy-elisp-modes
-  '(emacs-lisp-mode lisp-interaction-mode eltex-mode minibuffer-inactive-mode
+  '(emacs-lisp-mode lisp-interaction-mode eltex-mode
+                    minibuffer-mode
+                    minibuffer-inactive-mode
                     suggest-mode)
   "Modes for which `lispy--eval-elisp' and related functions are appropriate.")
 
diff --git a/lispy.el b/lispy.el
index 70134b7f..1e25d0ad 100644
--- a/lispy.el
+++ b/lispy.el
@@ -7925,7 +7925,8 @@ Defaults to `error'."
       (forward-line 1))
     (move-marker end nil)))
 
-(defvar lispy-no-indent-modes '(minibuffer-inactive-mode
+(defvar lispy-no-indent-modes '(minibuffer-mode
+                                minibuffer-inactive-mode
                                 comint-mode)
   "List of major modes where `indent-for-tab-command' should not be used.
 `lispy--indent-for-tab' will do nothing if the current mode or any of its parent