diff --git a/src/lib/bookmarks/bookmarksmanager.ui b/src/lib/bookmarks/bookmarksmanager.ui
index d0cfa93ce..204337552 100644
--- a/src/lib/bookmarks/bookmarksmanager.ui
+++ b/src/lib/bookmarks/bookmarksmanager.ui
@@ -78,13 +78,10 @@
     </widget>
    </item>
    <item row="1" column="7">
-    <widget class="QToolButton" name="importExport">
+    <widget class="QPushButton" name="importExport">
      <property name="text">
       <string>Import and Export</string>
      </property>
-     <property name="popupMode">
-      <enum>QToolButton::InstantPopup</enum>
-     </property>
     </widget>
    </item>
   </layout>
diff --git a/src/lib/preferences/autofillmanager.cpp b/src/lib/preferences/autofillmanager.cpp
index ce59e7e1c..5cde04382 100644
--- a/src/lib/preferences/autofillmanager.cpp
+++ b/src/lib/preferences/autofillmanager.cpp
@@ -63,7 +63,6 @@ AutoFillManager::AutoFillManager(QWidget* parent)
     menu->addAction(tr("Import Passwords from File..."), this, SLOT(importPasswords()));
     menu->addAction(tr("Export Passwords to File..."), this, SLOT(exportPasswords()));
     ui->importExport->setMenu(menu);
-    ui->importExport->setPopupMode(QToolButton::InstantPopup);
     ui->search->setPlaceholderText(tr("Search"));
 
     // Password backends
diff --git a/src/lib/preferences/autofillmanager.ui b/src/lib/preferences/autofillmanager.ui
index f6ce29623..8da63f641 100644
--- a/src/lib/preferences/autofillmanager.ui
+++ b/src/lib/preferences/autofillmanager.ui
@@ -102,7 +102,7 @@
        <item row="3" column="0" colspan="2">
         <layout class="QHBoxLayout" name="showPasswordsLayout">
          <item>
-          <widget class="QToolButton" name="importExport">
+          <widget class="QPushButton" name="importExport">
            <property name="sizePolicy">
             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
              <horstretch>0</horstretch>