2 files changed, 34 insertions, 5 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
index 79468768..442a5183 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
@@ -9,6 +9,15 @@
 
 .viewOptions .autoCodeComplete{
     float:left;
+    height: 20px;
+}
+
+.viewOptions .autoCodeComplete span{
+    vertical-align: middle;
+}
+
+.viewOptions .autoCodeComplete .disabled{
+    color:#515151;
 }
 
 .viewOptions .floatButtons{
diff --git a/js/controllers/code-editor-controller.js b/js/controllers/code-editor-controller.js
index 8757dceb..5dee4ab2 100644
--- a/js/controllers/code-editor-controller.js
+++ b/js/controllers/code-editor-controller.js
@@ -166,11 +166,31 @@ var CodeEditorController = exports.CodeEditorController = Montage.create(Compone
 
     handleCodeCompletionSupport:{
         value:function(fileType){
-            var autoCodeCompleteElem = document.getElementsByClassName("autoCodeComplete")[0];
-            if(autoCodeCompleteElem && (this.codeCompletionSupport[fileType] === true)){
-                autoCodeCompleteElem.style.visibility = "visible";
-            }else if(autoCodeCompleteElem && !this.codeCompletionSupport[fileType]){
-                autoCodeCompleteElem.style.visibility = "hidden";
+            var autoCodeCompleteElem = document.getElementsByClassName("autoCodeComplete")[0], elems=null, i=0;
+            if(autoCodeCompleteElem){
+                elems = autoCodeCompleteElem.getElementsByTagName("*");
+            }
+
+            if(elems && (this.codeCompletionSupport[fileType] === true)){
+                //enable elements
+                for(i=0;i<elems.length;i++){
+                    if(elems[i].hasAttribute("disabled")){
+                        elems[i].removeAttribute("disabled");
+                    }
+                    if(elems[i].classList.contains("disabled")){
+                        elems[i].classList.remove("disabled");
+                    }
+                }
+            }else if(elems && !this.codeCompletionSupport[fileType]){
+                //disable elements
+                for(i=0;i<elems.length;i++){
+                    if(!elems[i].hasAttribute("disabled")){
+                        elems[i].setAttribute("disabled", "disabled");
+                    }
+                    if(!elems[i].classList.contains("disabled")){
+                        elems[i].classList.add("disabled");
+                    }
+                }
             }
         }
     },