diff --git a/rhodecode/public/js/src/rhodecode/codemirror.js b/rhodecode/public/js/src/rhodecode/codemirror.js
index 9c2ac35c..e4d21ec0 100644
--- a/rhodecode/public/js/src/rhodecode/codemirror.js
+++ b/rhodecode/public/js/src/rhodecode/codemirror.js
@@ -23,7 +23,7 @@
 // Logger.get('CodeMirror').setLevel(Logger.DEBUG)
 
 cmLog = Logger.get('CodeMirror');
-cmLog.setLevel(Logger.OFF);
+cmLog.setLevel(Logger.ERROR);
 
 
 //global cache for inline forms
@@ -426,8 +426,16 @@ var initCommentBoxCodeMirror = function(CommentForm, textAreaId, triggerActions)
           searchText: "note comment",
           displayText: _gettext('Note Comment'),
           hint: function(CodeMirror, data, completion) {
-              CodeMirror.replaceRange("", completion.from || data.from,
-                          completion.to || data.to, "complete");
+              let from = completion.from || data.from;
+              const to = completion.to || data.to;
+
+              // If the replacement range starts at '/', skip it so '/' remains
+              const line = cm.getLine(from.line);
+              if (line && line[from.ch] === "/") {
+                from = { line: from.line, ch: from.ch + 1 };
+              }
+
+              cm.replaceRange("", from, to, "complete");
 
               $(CommentForm.commentType).val('note');
           },