diff --git a/tool-support/emacs/scala-mode.el b/tool-support/emacs/scala-mode.el
index 47a2a7c..9de2031 100644
--- a/tool-support/emacs/scala-mode.el
+++ b/tool-support/emacs/scala-mode.el
@@ -197,7 +197,7 @@ When started, run `scala-mode-hook'.
    )
 
   (use-local-map scala-mode-map)
-  (turn-on-font-lock)
+  (turn-on-font-lock-if-desired)
   (scala-mode-feature-install)
   )