diff --git a/customcommands/assets/customcommands-editcmd.html b/customcommands/assets/customcommands-editcmd.html
index 01e620c2c4..3d49ba5e56 100644
--- a/customcommands/assets/customcommands-editcmd.html
+++ b/customcommands/assets/customcommands-editcmd.html
@@ -553,10 +553,10 @@ <h2 class="card-title">Custom Command Information</h2>
 
     $(function () {
         triggerTypeChanged();
-
         updateCCLength();
         updateTriggerLength();
         updateNameLength();
+        setCMCheckbox();
     });
 
     var intervalTriggerEls = ['#interval-cc-run-now', '#cc-time-trigger-details'];
@@ -579,6 +579,14 @@ <h2 class="card-title">Custom Command Information</h2>
         none: ['#trigger-desc-none'],
     };
 
+    function setCMCheckbox() {
+      if(localStorage.getItem('cm-editor') === 'false'){
+        $("#toggle-code-mirror").prop( "checked", false );
+      } else {
+        $("#toggle-code-mirror").prop( "checked", true );
+      }
+    }
+
     function triggerTypeChanged() {
         const curTriggerType = $('#trigger-type-dropdown').val();
 
@@ -744,6 +752,7 @@ <h2 class="card-title">Custom Command Information</h2>
     }
 </style>
 <script type="text/javascript">
+
     function setupCodeMirrorEditor(textArea) {
         var isCMEditor = localStorage.getItem('cm-editor')
         if(isCMEditor === 'false') return