diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index c0aac7301..346bb181f 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -195,6 +195,9 @@ BlazeComponent.extendComponent({
     });
 
     this.autorun(() => {
+      // Always reset dragscroll on view switch
+      dragscroll.reset();
+
       if (Utils.isTouchScreenOrShowDesktopDragHandles()) {
         $swimlanesDom.sortable({
           handle: '.js-swimlane-header-handle',
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index ea235a526..1f450e935 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -1,5 +1,6 @@
 import { ReactiveCache } from '/imports/reactiveCache';
 import { TAPi18n } from '/imports/i18n';
+import dragscroll from '@wekanteam/dragscroll';
 
 /*
 const DOWNCLS = 'fa-sort-down';
@@ -78,6 +79,7 @@ BlazeComponent.extendComponent({
           ReactiveCache.getCurrentUser().toggleBoardStar(Session.get('currentBoard'));
         },
         'click .js-auto-width-board'() {
+          dragscroll.reset();
           ReactiveCache.getCurrentUser().toggleAutoWidth(Utils.getCurrentBoardId());
         },
         'click .js-open-board-menu': Popup.open('boardMenu'),