diff --git a/plugins/tools/basictools/kis_tool_pan.cpp b/plugins/tools/basictools/kis_tool_pan.cpp
index 6a12f43380..c679b325f7 100644
--- a/plugins/tools/basictools/kis_tool_pan.cpp
+++ b/plugins/tools/basictools/kis_tool_pan.cpp
@@ -1,100 +1,105 @@
 /*
  *  Copyright (c) 2017 Victor Wåhlström <victor.wahlstrom@initiali.se>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "kis_tool_pan.h"
 #include "kis_cursor.h"
 #include "kis_canvas2.h"
 
 #include <KoCanvasController.h>
 
 #include <KoIcon.h>
 #include <klocalizedstring.h>
 
 
 KisToolPan::KisToolPan(KoCanvasBase *canvas)
     : KisTool(canvas, KisCursor::openHandCursor())
 {
 }
 
 KisToolPan::~KisToolPan()
 {
 }
 
 void KisToolPan::beginPrimaryAction(KoPointerEvent *event)
 {
     m_lastPosition = event->pos();
     useCursor(KisCursor::closedHandCursor());
 }
 
 void KisToolPan::continuePrimaryAction(KoPointerEvent *event)
 {
     QPoint pos = event->pos();
     QPoint delta = m_lastPosition - pos;
     canvas()->canvasController()->pan(delta);
     m_lastPosition = pos;
 }
 
 void KisToolPan::endPrimaryAction(KoPointerEvent *event)
 {
     Q_UNUSED(event);
     useCursor(KisCursor::openHandCursor());
 }
 
 void KisToolPan::keyPressEvent(QKeyEvent *event)
 {
     switch (event->key()) {
         case Qt::Key_Up:
             canvas()->canvasController()->panUp();
             break;
         case Qt::Key_Down:
             canvas()->canvasController()->panDown();
             break;
         case Qt::Key_Left:
             canvas()->canvasController()->panLeft();
             break;
         case Qt::Key_Right:
             canvas()->canvasController()->panRight();
             break;
     }
     event->accept();
 }
 
 void KisToolPan::paint(QPainter &painter, const KoViewConverter &converter)
 {
     Q_UNUSED(painter);
     Q_UNUSED(converter);
 }
 
+bool KisToolPan::wantsAutoScroll() const
+{
+    return false;
+}
+
 KisToolPanFactory::KisToolPanFactory()
     : KoToolFactoryBase("PanTool")
 {
     setToolTip(i18n("Pan Tool"));
     setSection(navigationToolType());
     setActivationShapeId(KRITA_TOOL_ACTIVATION_ID);
     setPriority(2);
     setIconName(koIconNameCStr("tool_pan"));
 }
 
 KisToolPanFactory::~KisToolPanFactory()
 {
 }
 
 KoToolBase* KisToolPanFactory::createTool(KoCanvasBase *canvas)
 {
     return new KisToolPan(canvas);
 }
diff --git a/plugins/tools/basictools/kis_tool_pan.h b/plugins/tools/basictools/kis_tool_pan.h
index 1b16e120c7..4f93cdf0ef 100644
--- a/plugins/tools/basictools/kis_tool_pan.h
+++ b/plugins/tools/basictools/kis_tool_pan.h
@@ -1,54 +1,56 @@
 /*
  *  Copyright (c) 2017 Victor Wåhlström <victor.wahlstrom@initiali.se>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KIS_TOOL_PAN_H_
 #define KIS_TOOL_PAN_H_
 
 #include <kis_tool.h>
 #include <KoToolFactoryBase.h>
 
 class KisToolPan : public KisTool
 {
     Q_OBJECT
 public:
     KisToolPan(KoCanvasBase *canvas);
     ~KisToolPan() override;
 
     void beginPrimaryAction(KoPointerEvent *event) override;
     void continuePrimaryAction(KoPointerEvent *event) override;
     void endPrimaryAction(KoPointerEvent *event) override;
 
     void keyPressEvent(QKeyEvent *event) override;
 
     void paint(QPainter &painter, const KoViewConverter &converter) override;
 
+    bool wantsAutoScroll() const;
+
 private:
     QPoint m_lastPosition;
 };
 
 
 class KisToolPanFactory : public KoToolFactoryBase
 {
 public:
     KisToolPanFactory();
     ~KisToolPanFactory() override;
 
     KoToolBase *createTool(KoCanvasBase *canvas) override;
 };
 
 #endif // KIS_TOOL_PAN_H_