diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp
index 4969315e..3544d464 100644
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
@@ -126,6 +126,8 @@ UBDesktopAnnotationController::UBDesktopAnnotationController(QObject *parent, UB
     connect(UBApplication::mainWindow->actionSelector, SIGNAL(triggered()), this, SLOT(onToolClicked()));
     connect(mDesktopPalette, SIGNAL(maximized()), this, SLOT(onDesktopPaletteMaximized()));
     connect(mDesktopPalette, SIGNAL(minimizeStart(eMinimizedLocation)), this, SLOT(onDesktopPaletteMinimize()));
+    connect(mDesktopPalette, SIGNAL(mouseEntered()), mTransparentDrawingScene, SLOT(hideTool()));
+    connect(mRightPalette, SIGNAL(mouseEntered()), mTransparentDrawingScene, SLOT(hideTool()));
 
     connect(mTransparentDrawingView, SIGNAL(resized(QResizeEvent*)), this, SLOT(onTransparentWidgetResized()));
 
diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp
index 401a3c6d..7dda5258 100644
--- a/src/gui/UBDockPalette.cpp
+++ b/src/gui/UBDockPalette.cpp
@@ -197,6 +197,7 @@ void UBDockPalette::enterEvent(QEvent *event)
     Q_UNUSED(event);
     // We want to set the cursor as an arrow everytime it enters the palette
     setCursor(Qt::ArrowCursor);
+    emit mouseEntered();
 }
 
 /**
diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h
index d2476b8f..d13b36bf 100644
--- a/src/gui/UBDockPalette.h
+++ b/src/gui/UBDockPalette.h
@@ -150,6 +150,9 @@ public slots:
     void onAllDownloadsFinished();
     virtual void onDocumentSet(UBDocumentProxy* documentProxy);
 
+signals:
+    void mouseEntered();
+
 protected:
     virtual int border();
     virtual int radius();