diff --git a/core/scrollbar.js b/core/scrollbar.js
index 24b56d8e3..fecc42d26 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -711,6 +711,12 @@ Blockly.Scrollbar.prototype.onMouseDownHandle_ = function(e) {
   }
   // Look up the current translation and record it.
   this.startDragHandle = this.handlePosition_;
+
+  // Tell the workspace to setup its drag surface since it is about to move.
+  // onMouseMoveHandle will call onScroll which actually tells the workspace
+  // to move.
+  this.workspace_.setupDragSurface();
+
   // Record the current mouse position.
   this.startDragMouse = this.horizontal_ ? e.clientX : e.clientY;
   Blockly.Scrollbar.onMouseUpWrapper_ = Blockly.bindEventWithChecks_(document,
@@ -740,6 +746,8 @@ Blockly.Scrollbar.prototype.onMouseMoveHandle_ = function(e) {
  * @private
  */
 Blockly.Scrollbar.prototype.onMouseUpHandle_ = function() {
+  // Tell the workspace to clean up now that the workspace is done moving.
+  this.workspace_.resetDragSurface();
   Blockly.Touch.clearTouchIdentifier();
   this.cleanUp_();
 };
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index 283e30579..4c821d457 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -208,6 +208,16 @@ Blockly.WorkspaceSvg.prototype.workspaceDragSurface_ = null;
   */
  Blockly.WorkspaceSvg.prototype.useWorkspaceDragSurface_ = false;
 
+/**
+ * Whether the drag surface is actively in use. When true, calls to
+ * translate will translate the drag surface instead of the translating the
+ * workspace directly.
+ * This is set to true in setupDragSurface and to false in resetDragSurface.
+ * @type {boolean}
+ * @private
+ */
+Blockly.WorkspaceSvg.prototype.isDragSurfaceActive_ = false;
+
 /**
  * Time that the last sound was played.
  * @type {Date}
@@ -606,7 +616,7 @@ Blockly.WorkspaceSvg.prototype.getParentSvg = function() {
  * @param {number} y Vertical translation.
  */
 Blockly.WorkspaceSvg.prototype.translate = function(x, y) {
-  if (this.useWorkspaceDragSurface_ && this.dragMode_ != Blockly.DRAG_NONE) {
+  if (this.useWorkspaceDragSurface_ && this.isDragSurfaceActive_) {
     this.workspaceDragSurface_.translateSurface(x,y);
   } else {
     var translation = 'translate(' + x + ',' + y + ') ' +
@@ -632,6 +642,8 @@ Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
     return;
   }
 
+  this.isDragSurfaceActive_ = false;
+
   var trans = this.workspaceDragSurface_.getSurfaceTranslation();
   this.workspaceDragSurface_.clearAndHide(this.svgGroup_);
   var translation = 'translate(' + trans.x + ',' + trans.y + ') ' +
@@ -644,7 +656,7 @@ Blockly.WorkspaceSvg.prototype.resetDragSurface = function() {
  * Called at the beginning of a workspace drag to move contents of
  * the workspace to the drag surface.
  * Does nothing if the drag surface is not enabled.
- * @package.
+ * @package
  */
 Blockly.WorkspaceSvg.prototype.setupDragSurface = function() {
   // Don't do anything if we aren't using a drag surface.
@@ -652,6 +664,8 @@ Blockly.WorkspaceSvg.prototype.setupDragSurface = function() {
     return;
   }
 
+  this.isDragSurfaceActive_ = true;
+
   // Figure out where we want to put the canvas back.  The order
   // in the is important because things are layered.
   var previousElement = this.svgBlockCanvas_.previousSibling;