diff --git a/appearance.el b/appearance.el
index 37a99a8..8a249a0 100644
--- a/appearance.el
+++ b/appearance.el
@@ -49,6 +49,11 @@
 (when (require 'grizzl nil 'noerror)
   (setq *grizzl-read-max-results* 20))
 
+;; Due to Grizzl crashing Emacs 24.4 nightlies in terminal, only use it in
+;; full GUI mode.
+(if gui-window-system
+    (setq projectile-completion-system 'grizzl))
+
 ;; Display ido results vertically, rather than horizontally.
 (when (require 'ido-vertical-mode nil 'noerror)
   (ido-vertical-mode 1))
diff --git a/custom-variables.el b/custom-variables.el
index 6160922..506bae7 100644
--- a/custom-variables.el
+++ b/custom-variables.el
@@ -103,7 +103,6 @@
  '(persp-modestring-dividers (quote (" [" "]" "|")))
  '(persp-show-modestring t)
  '(php-mode-dot-property-warning t)
- '(projectile-completion-system (quote grizzl))
  '(projectile-enable-caching nil)
  '(projectile-globally-ignored-directories
    (quote