diff --git a/part/annotationactionhandler.cpp b/part/annotationactionhandler.cpp
index 99d504ee9becb5e43c570fe227d889ecdb3da839..ddaed908c43b762ec00e63dd1f755a2988ace822 100644
--- a/part/annotationactionhandler.cpp
+++ b/part/annotationactionhandler.cpp
@@ -396,10 +396,15 @@ void AnnotationActionHandlerPrivate::populateQuickAnnotations()
 
     // set the default action
     if (quickTools.isEmpty()) {
-        aQuickTools->setDefaultAction(aQuickTools);
+        aShowToolBar->setVisible(false);
+        aQuickTools->addAction(aToolBarVisibility);
+        aQuickTools->setDefaultAction(aToolBarVisibility);
         Okular::Settings::setQuickAnnotationDefaultAction(0);
         Okular::Settings::self()->save();
     } else {
+        aShowToolBar->setVisible(true);
+        aQuickTools->removeAction(aToolBarVisibility);
+        aQuickTools->setDefaultAction(aQuickTools);
         int defaultAction = Okular::Settings::quickAnnotationDefaultAction();
         if (isFirstTimePopulated && defaultAction < quickTools.count()) {
             // we can reach here also if no quick tools were defined before, in that case defaultAction is correctly equal to zero