diff --git a/part/pageviewannotator.cpp b/part/pageviewannotator.cpp
index 1a141ff53..699cc1a13 100644
--- a/part/pageviewannotator.cpp
+++ b/part/pageviewannotator.cpp
@@ -971,6 +971,7 @@ QRect PageViewAnnotator::performRouteMouseOrTabletEvent(const AnnotatorEngine::E
             if (signEngine->isAccepted()) {
                 static_cast<PickPointEngineSignature *>(m_engine)->sign(m_lockedItem->pageNumber());
             }
+            m_continuousMode = false;
         }
 
         if (m_continuousMode)
@@ -1185,8 +1186,8 @@ void PageViewAnnotator::selectStampTool(const QString &stampSymbol)
 
 void PageViewAnnotator::detachAnnotation()
 {
+    selectTool(-1, ShowTip::No);
     if (!signatureMode()) {
-        selectTool(-1, ShowTip::No);
         if (m_actionHandler)
             m_actionHandler->deselectAllAnnotationActions();
     } else {