Merge branch 'master' into develop

src/gui/DatabaseWidget.cpp

@@ -783,6 +783,9 @@ void DatabaseWidget::switchToMainView(bool previousDialogAccepted)
         }
 
         m_newParent = nullptr;
+    } else {
+        // Workaround: ensure entries are focused so search doesn't reset
+        m_entryView->setFocus();
     }
 
     setCurrentWidget(m_mainWidget);