diff --git a/src/bookmarkshistorymodel.cpp b/src/bookmarkshistorymodel.cpp
index b9beb887b7bce595cc60418281ad11622daf1c3d..c571685e3c2966eb2525436b08b9336d1655904a 100644
--- a/src/bookmarkshistorymodel.cpp
+++ b/src/bookmarkshistorymodel.cpp
@@ -79,6 +79,9 @@ void BookmarksHistoryModel::onDatabaseChanged(const QString &table)
 
 void BookmarksHistoryModel::setQuery()
 {
+    if (!m_active)
+        return;
+
     QString command;
     QString b = QStringLiteral("SELECT rowid AS id, url, title, icon, :now - lastVisited AS lastVisited, %1 AS bookmarked FROM %2 ");
     QLatin1String filter = m_filter.isEmpty() ? QLatin1String() : QLatin1String("WHERE url LIKE '%' || :filter || '%' OR title LIKE '%' || :filter || '%'");
diff --git a/src/contents/ui/NavigationEntrySheet.qml b/src/contents/ui/NavigationEntrySheet.qml
index 7d4164837d7e9a757e7a63cb513b5e76d5b3bc4d..18e9c8a13ca6020a818cae19c07579668548a448 100644
--- a/src/contents/ui/NavigationEntrySheet.qml
+++ b/src/contents/ui/NavigationEntrySheet.qml
@@ -141,7 +141,6 @@ Controls.Drawer {
     onOpened: {
         // check if the drawer was just slightly slided
         if (openedState) return;
-        openedState = true;
         urlInput.text = currentWebView.requestedUrl;
         urlInput.forceActiveFocus();
         urlInput.selectAll();