--- a/SmallSense__EditSupport.st	Wed Feb 26 19:28:14 2014 +0100
+++ b/SmallSense__EditSupport.st	Thu Feb 27 09:47:48 2014 +0000
@@ -285,14 +285,16 @@
 !EditSupport methodsFor:'initialization'!
 
 initializeCompletion
-    self completionEngineClass  notNil ifTrue:[
-        completionController := CompletionController for: service textView.
-        completionController support: self.
-        service textView completionSupport: completionController.
+    UserPreferences current smallSenseCompletionEnabled ifTrue:[
+        self completionEngineClass  notNil ifTrue:[
+            completionController := CompletionController for: service textView.
+            completionController support: self.
+            service textView completionSupport: completionController.
+        ].
     ].
 
     "Created: / 27-09-2013 / 13:20:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 03-10-2013 / 17:44:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-02-2014 / 09:30:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 initializeForService:aSmallSenseService