diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js
index d72277d8ec..40f9d30092 100644
--- a/src/editor/EditorManager.js
+++ b/src/editor/EditorManager.js
@@ -775,7 +775,7 @@ define(function (require, exports, module) {
 
     // Set up event dispatching
     EventDispatcher.makeEventDispatcher(exports);
-    EventDispatcher.setLeakThresholdForEvent(EVENT_ACTIVE_EDITOR_CHANGED, 25);
+    EventDispatcher.setLeakThresholdForEvent(EVENT_ACTIVE_EDITOR_CHANGED, 30);
 
     // File-based preferences handling
     exports.on(EVENT_ACTIVE_EDITOR_CHANGED, function (e, current) {
diff --git a/src/extensions/default/Git/src/GutterManager.js b/src/extensions/default/Git/src/GutterManager.js
index 7c6db24df1..e5f5281b7a 100644
--- a/src/extensions/default/Git/src/GutterManager.js
+++ b/src/extensions/default/Git/src/GutterManager.js
@@ -49,6 +49,11 @@ define(function (require, exports) {
 
     function _cursorActivity(_evt, editor){
         // this is to prevent a gutter gap in the active line if there is no color on this line.
+        if (editor.hasSelection()){
+            // we dont show the gutter gap color when there is a selection. also adding dummy gutter is expensive
+            // and make test selection with cursor choppy
+            return;
+        }
         _addDummyGutterMarkerIfNotExist(editor._codeMirror, editor.getCursorPos().line);
     }
 
diff --git a/src/extensionsIntegrated/CSSColorPreview/main.js b/src/extensionsIntegrated/CSSColorPreview/main.js
index e5b03b5c5e..04a4ad9dbc 100644
--- a/src/extensionsIntegrated/CSSColorPreview/main.js
+++ b/src/extensionsIntegrated/CSSColorPreview/main.js
@@ -213,6 +213,11 @@ define(function (require, exports, module) {
 
     function _cursorActivity(_evt, editor){
         // this is to prevent a gutter gap in the active line if there is no color on this line.
+        if(editor.hasSelection()){
+            // we dont show the gutter gap color when there is a selection. also adding dummy gutter is expensive
+            // and make test selection with cursor choppy
+            return;
+        }
         _addDummyGutterMarkerIfNotExist(editor, editor.getCursorPos().line);
         if(editor._currentlyColorMarkedLine){
             editor.clearAllMarks(COLOR_MARK_NAME);
diff --git a/src/extensionsIntegrated/HtmlTagSyncEdit/main.js b/src/extensionsIntegrated/HtmlTagSyncEdit/main.js
index 463db703ff..d279e27200 100644
--- a/src/extensionsIntegrated/HtmlTagSyncEdit/main.js
+++ b/src/extensionsIntegrated/HtmlTagSyncEdit/main.js
@@ -237,7 +237,9 @@ define(function (require, exports, module) {
 
     function cursorActivity() {
         const cursor = activeEditor.getCursorPos();
-        if(activeEditor.hasMultipleCursors()){
+        const sel = activeEditor.getSelection();
+        const multiLineSelection = sel.start.line !== sel.end.line;
+        if(activeEditor.hasMultipleCursors() || multiLineSelection){
             clearRenameMarkers();
             return;
         }