diff --git a/lib/ace/mouse/default_gutter_handler.js b/lib/ace/mouse/default_gutter_handler.js
index d03e18ce..a43ec16a 100644
--- a/lib/ace/mouse/default_gutter_handler.js
+++ b/lib/ace/mouse/default_gutter_handler.js
@@ -52,10 +52,14 @@ function GutterHandler(mouseHandler) {
         var row = e.getDocumentPosition().row;
         var selection = editor.session.selection;
 
-        selection.moveCursorTo(row, 0);
-        selection.selectLine();
+        if (e.getShiftKey()) {
+            selection.selectTo(row, 0);
+        } else {
+            selection.moveCursorTo(row, 0);
+            selection.selectLine();
+            mouseHandler.$clickSelection = selection.getRange();
+        }
 
-        mouseHandler.$clickSelection = selection.getRange();
         mouseHandler.captureMouse(e, "selectByLines");
     });
 }
diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js
index 34d6ef1b..48fe88d7 100644
--- a/lib/ace/mouse/default_handlers.js
+++ b/lib/ace/mouse/default_handlers.js
@@ -297,7 +297,7 @@ function DefaultHandlers(mouseHandler) {
 
         editor.selectAll();
         this.$clickSelection = editor.getSelectionRange();
-        this.setState("select");
+        this.setState("null");
     };
 
     this.onScroll = function(ev) {