diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 0e25b8b0..ccef2d98 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -848,6 +848,13 @@ void UBBoardView::handleItemMouseMove(QMouseEvent *event)
             QGraphicsView::mouseMoveEvent (event);
             posAfterMove = getMovingItem()->pos();
         }
+        else
+        {
+            if (!mMouseButtonIsPressed)
+            {
+                QGraphicsView::mouseMoveEvent(event);
+            }
+        }
 
         mWidgetMoved = ((posAfterMove-posBeforeMove).manhattanLength() != 0);
 
@@ -1134,9 +1141,6 @@ void UBBoardView::mouseMoveEvent (QMouseEvent *event)
         return;
     }
 
-    if ((UBDrawingController::drawingController()->isDrawingTool()) && !mMouseButtonIsPressed)
-        QGraphicsView::mouseMoveEvent(event);
-
     int currentTool = static_cast<int>(UBDrawingController::drawingController()->stylusTool());
     switch (currentTool) {