diff --git a/js/app/services/undoqueue.coffee b/js/app/services/undoqueue.coffee
index 30418bacf..93f6fb577 100644
--- a/js/app/services/undoqueue.coffee
+++ b/js/app/services/undoqueue.coffee
@@ -57,6 +57,7 @@ angular.module('News').factory 'UndoQueue',
 					@_queue = []
 				promise: @_$timeout =>
 					command.execute()
+					@_queue = []
 					@_$rootScope.$broadcast('notUndone')
 				, @_timeout
 
diff --git a/js/public/app.js b/js/public/app.js
index e38c84d59..1ce79357b 100644
--- a/js/public/app.js
+++ b/js/public/app.js
@@ -3178,6 +3178,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
             },
             promise: this._$timeout(function() {
               command.execute();
+              _this._queue = [];
               return _this._$rootScope.$broadcast('notUndone');
             }, this._timeout)
           };
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index 7a0d4de52..a6cc973bb 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -13,7 +13,7 @@
 		axis: 'y',
 		delay: 200,
 		helper: 'clone',
-		containment: 'window',
+		containment: 'document',
 		scroll: true,
 		scrollSensitivity: 100
 	}">