diff --git a/src/js/controller/DrawingController.js b/src/js/controller/DrawingController.js
index b9db4ed3..2881761d 100644
--- a/src/js/controller/DrawingController.js
+++ b/src/js/controller/DrawingController.js
@@ -75,6 +75,7 @@
 
     window.addEventListener('mouseup', this.onMouseup_.bind(this));
     window.addEventListener('mousemove', this.onMousemove_.bind(this));
+    window.addEventListener('keyup', this.onKeyup_.bind(this));
 
     // Deactivate right click:
     body.contextmenu(this.onCanvasContextMenu_);
@@ -146,40 +147,54 @@
    * @private
    */
   ns.DrawingController.prototype.onMousemove_ = function (event) {
+    this._clientX = event.clientX;
+    this._clientY = event.clientY;
+
     var currentTime = new Date().getTime();
     // Throttling of the mousemove event:
 
     if ((currentTime - this.previousMousemoveTime) > Constants.MOUSEMOVE_THROTTLING ) {
-      var coords = this.renderer.getCoordinates(event.clientX, event.clientY);
-      var currentFrame = this.piskelController.getCurrentFrame();
-
-      if (this.isClicked) {
-        // Warning : do not call setCurrentButton here
-        // mousemove do not have the correct mouse button information on all browsers
-        this.currentToolBehavior.moveToolAt(
-          coords.x | 0,
-          coords.y | 0,
-          this.getCurrentColor_(event),
-          currentFrame,
-          this.overlayFrame,
-          event
-        );
-      } else {
-
-        this.currentToolBehavior.moveUnactiveToolAt(
-          coords.x,
-          coords.y,
-          this.getCurrentColor_(event),
-          currentFrame,
-          this.overlayFrame,
-          event
-        );
-      }
-      $.publish(Events.CURSOR_MOVED, [coords.x, coords.y]);
+      this.moveTool_(this._clientX, this._clientY, event);
       this.previousMousemoveTime = currentTime;
     }
   };
 
+  /**
+   * @private
+   */
+  ns.DrawingController.prototype.onKeyup_ = function (event) {
+    this.moveTool_(this._clientX, this._clientY, event);
+  };
+
+  ns.DrawingController.prototype.moveTool_ = function (x, y, event) {
+    var coords = this.renderer.getCoordinates(x, y);
+    var currentFrame = this.piskelController.getCurrentFrame();
+
+    if (this.isClicked) {
+      // Warning : do not call setCurrentButton here
+      // mousemove do not have the correct mouse button information on all browsers
+      this.currentToolBehavior.moveToolAt(
+        coords.x | 0,
+        coords.y | 0,
+        this.getCurrentColor_(),
+        currentFrame,
+        this.overlayFrame,
+        event
+      );
+    } else {
+
+      this.currentToolBehavior.moveUnactiveToolAt(
+        coords.x,
+        coords.y,
+        this.getCurrentColor_(),
+        currentFrame,
+        this.overlayFrame,
+        event
+      );
+    }
+    $.publish(Events.CURSOR_MOVED, [coords.x, coords.y]);
+  }
+
   ns.DrawingController.prototype.onMousewheel_ = function (jQueryEvent) {
     var event = jQueryEvent.originalEvent;
     var delta = event.wheelDeltaY || (-2 * event.deltaY);
diff --git a/src/js/drawingtools/ShapeTool.js b/src/js/drawingtools/ShapeTool.js
index a99965d2..df9d12b5 100644
--- a/src/js/drawingtools/ShapeTool.js
+++ b/src/js/drawingtools/ShapeTool.js
@@ -42,11 +42,6 @@
    */
   ns.ShapeTool.prototype.releaseToolAt = function(col, row, color, frame, overlay, event) {
     overlay.clear();
-    if (event.shiftKey) {
-      var scaled = this.getScaledCoordinates_(col, row);
-      col = scaled.col;
-      row = scaled.row;
-    }
     var coords = this.getCoordinates_(col, row, event);
     this.draw_(coords.col, coords.row, color, frame);