diff --git a/src/UI/Main/CSConsole/CSharpConsole.cs b/src/UI/Main/CSConsole/CSharpConsole.cs
index a91392a..0cc5766 100644
--- a/src/UI/Main/CSConsole/CSharpConsole.cs
+++ b/src/UI/Main/CSConsole/CSharpConsole.cs
@@ -284,14 +284,16 @@ The following helper methods are available:
                 return;
             }
 
-            UpdateIndent(newText);
+            if (EnableAutoIndent)
+                UpdateIndent(newText);
 
             if (!forceUpdate && string.IsNullOrEmpty(newText))
                 inputHighlightText.text = string.Empty;
             else
                 inputHighlightText.text = SyntaxHighlightContent(newText);
 
-            UpdateAutocompletes();
+            if (EnableAutocompletes)
+                UpdateAutocompletes();
         }
 
         private void UpdateIndent(string newText)