diff --git a/src/index.html b/src/index.html
index bcda82d..b5c370c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -461,6 +461,9 @@
 						</div>
 					</div>
           			<div class="ml-2">
+						<label class="line" title="Toggle wrapping of long sentences onto new line">
+							<input type="checkbox" d-change="updateSetting" data-setting="lineWrap"> Line wrap
+						</label>
 						<label class="line" title="Your Preview will refresh when you resize the preview split">
 							<input type="checkbox" d-change="updateSetting" data-setting="refreshOnResize"> Refresh preview on resize
 						</label>
diff --git a/src/script.js b/src/script.js
index ab8ae4f..966f712 100644
--- a/src/script.js
+++ b/src/script.js
@@ -1619,6 +1619,7 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
 		$('[data-setting=autoComplete]').checked = prefs.autoComplete;
 		$('[data-setting=preserveConsoleLogs]').checked = prefs.preserveConsoleLogs;
 		$('[data-setting=lightVersion]').checked = prefs.lightVersion;
+		$('[data-setting=lineWrap]').checked = prefs.lineWrap;
 	}
 
 	/**
@@ -1688,6 +1689,10 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
 				'keyMap',
 				$('[data-setting=keymap]:checked').value
 			);
+			scope.cm[type].setOption(
+				'lineWrapping',
+				$('[data-setting=lineWrap]').checked
+			);
 			scope.cm[type].refresh();
 		});
 		scope.consoleCm.setOption('theme', $('[data-setting=editorTheme]').value);
@@ -2030,7 +2035,6 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
 			}
 			// Ctrl/⌘ + Shift + 5
 			if (
-				!prefs.autoPreview &&
 				(event.ctrlKey || event.metaKey) &&
 				event.shiftKey &&
 				event.keyCode === 53
@@ -2218,7 +2222,8 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
 				autoSave: true,
 				autoComplete: true,
 				preserveConsoleLogs: true,
-				lightVersion: true
+				lightVersion: true,
+				lineWrap: true
 			},
 			function syncGetCallback(result) {
 				if (result.preserveLastCode && lastCode) {
@@ -2256,6 +2261,7 @@ customEditorFontInput, cssSettingsModal, cssSettingsBtn, acssSettingsTextarea
 				prefs.autoComplete = result.autoComplete;
 				prefs.preserveConsoleLogs = result.preserveConsoleLogs;
 				prefs.lightVersion = result.lightVersion;
+				prefs.lineWrap = result.lineWrap;
 
 				updateSettingsInUi();
 				scope.updateSetting();