From b18838518492b4d3c9de490eac856ca057f21b48 Mon Sep 17 00:00:00 2001
From: Ojas Anand <sigmaupsilon@users.noreply.github.com>
Date: Thu, 27 Feb 2020 21:21:27 -0500
Subject: [PATCH] Return keyboard focus after saving database edits (#4287)

---
 src/gui/DatabaseWidget.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index d7521f3b2..3d6598fb2 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -1657,6 +1657,8 @@ bool DatabaseWidget::save()
     m_blockAutoSave = true;
     ++m_saveAttempts;
 
+    auto focusWidget = qApp->focusWidget();
+
     // TODO: Make this async
     // Lock out interactions
     m_entryView->setDisabled(true);
@@ -1671,6 +1673,10 @@ bool DatabaseWidget::save()
     m_entryView->setDisabled(false);
     m_groupView->setDisabled(false);
 
+    if (focusWidget) {
+        focusWidget->setFocus();
+    }
+
     if (ok) {
         m_saveAttempts = 0;
         m_blockAutoSave = false;