diff --git a/src/index.html b/src/index.html
index 35c2ac7..00baefd 100644
--- a/src/index.html
+++ b/src/index.html
@@ -437,6 +437,9 @@
 					<label class="line">
 						<input type="checkbox" d-change="updateSetting" data-setting="refreshOnResize"> Refresh preview on resize
 					</label>
+					<label class="line">
+						<input type="checkbox" d-change="updateSetting" data-setting="autoComplete"> Auto-complete suggestions
+					</label>
 					<label class="line">
 						<input type="checkbox" d-change="updateSetting" data-setting="autoPreview"> Auto-preview
 					</label>
diff --git a/src/script.js b/src/script.js
index 910fc73..3b14e4a 100644
--- a/src/script.js
+++ b/src/script.js
@@ -1203,13 +1203,13 @@ runBtn, searchInput, consoleEl, consoleLogEl, logCountEl, fontStyleTag, fontStyl
 				}
 			}, updateDelay);
 		});
-		if (options.noAutocomplete) {
-			cm.addKeyMap({
-				'Ctrl-Space': 'autocomplete'
-			});
-		} else {
+		cm.addKeyMap({
+			'Ctrl-Space': 'autocomplete'
+		});
+		if (!options.noAutocomplete) {
 			cm.on('inputRead', function onChange(editor, input) {
 				if (
+					!prefs.autoComplete ||
 					input.origin !== '+input' ||
 					input.text[0] === ';' ||
 					input.text[0] === ' '
@@ -1583,6 +1583,7 @@ runBtn, searchInput, consoleEl, consoleLogEl, logCountEl, fontStyleTag, fontStyl
 		$('[data-setting=autoPreview]').checked = prefs.autoPreview;
 		$('[data-setting=editorFont]').value = prefs.editorFont;
 		$('[data-setting=autoSave]').checked = prefs.autoSave;
+		$('[data-setting=autoComplete]').checked = prefs.autoComplete;
 	}
 
 	/**
@@ -2142,7 +2143,8 @@ runBtn, searchInput, consoleEl, consoleLogEl, logCountEl, fontStyleTag, fontStyl
 				refreshOnResize: false,
 				autoPreview: true,
 				editorFont: 'FiraCode',
-				autoSave: true
+				autoSave: true,
+				autoComplete: true
 			},
 			function syncGetCallback(result) {
 				if (result.preserveLastCode && lastCode) {
@@ -2176,6 +2178,7 @@ runBtn, searchInput, consoleEl, consoleLogEl, logCountEl, fontStyleTag, fontStyl
 				prefs.autoPreview = result.autoPreview;
 				prefs.editorFont = result.editorFont;
 				prefs.autoSave = result.autoSave;
+				prefs.autoComplete = result.autoComplete;
 
 				updateSettingsInUi();
 				scope.updateSetting();