diff --git a/src/Dialogs/SearchEditor.cpp b/src/Dialogs/SearchEditor.cpp
index 1ed14b676d..0ef9795280 100644
--- a/src/Dialogs/SearchEditor.cpp
+++ b/src/Dialogs/SearchEditor.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 **
-**  Copyright (C) 2015-2022 Kevin B. Hendricks, Stratford, Ontario, Canada
+**  Copyright (C) 2015-2024 Kevin B. Hendricks, Stratford, Ontario, Canada
 **  Copyright (C) 2012      John Schember <john@nachtimwald.com>
 **  Copyright (C) 2012      Dave Heiland
 **  Copyright (C) 2012      Grant Drake
@@ -139,7 +139,7 @@ void SearchEditor::ShowMessage(const QString &message)
 {
     ui.Message->setText(message);
     ui.Message->repaint();
-    QApplication::processEvents();
+    // QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 }
 
 bool SearchEditor::SaveData(QList<SearchEditorModel::searchEntry *> entries, QString filename)
diff --git a/src/Dialogs/SearchEditor.h b/src/Dialogs/SearchEditor.h
index a390eb6105..636daae8e5 100644
--- a/src/Dialogs/SearchEditor.h
+++ b/src/Dialogs/SearchEditor.h
@@ -1,9 +1,9 @@
 /************************************************************************
 **
-**  Copyright (C) 2022 Kevin B. Hendricks, Stratford Ontario Canada
-**  Copyright (C) 2012 John Schember <john@nachtimwald.com>
-**  Copyright (C) 2012 Dave Heiland
-**  Copyright (C) 2012 Grant Drake
+**  Copyright (C) 2022-2024 Kevin B. Hendricks, Stratford Ontario Canada
+**  Copyright (C) 2012      John Schember <john@nachtimwald.com>
+**  Copyright (C) 2012      Dave Heiland
+**  Copyright (C) 2012      Grant Drake
 **
 **  This file is part of Sigil.
 **
diff --git a/src/Form_Files/SearchEditor.ui b/src/Form_Files/SearchEditor.ui
index a5aa19c722..25f4ab98ba 100644
--- a/src/Form_Files/SearchEditor.ui
+++ b/src/Form_Files/SearchEditor.ui
@@ -102,7 +102,10 @@ If a group is selected, find the first entry in the list,
 then if not found look for the second entry in the list, etc.</string>
          </property>
          <property name="text">
-          <string>Find</string>
+          <string>&amp;Find</string>
+         </property>
+         <property name="shortcut">
+           <string>Alt+F</string>
          </property>
         </widget>
        </item>
diff --git a/src/MiscEditors/SearchEditorTreeView.cpp b/src/MiscEditors/SearchEditorTreeView.cpp
index 512d61d28f..7414757aaa 100644
--- a/src/MiscEditors/SearchEditorTreeView.cpp
+++ b/src/MiscEditors/SearchEditorTreeView.cpp
@@ -1,6 +1,6 @@
 /************************************************************************
 **
-**  Copyright (C) 2015-2021 Kevin B. Hendricks, Stratford Ontario Canada
+**  Copyright (C) 2015-2024 Kevin B. Hendricks, Stratford Ontario Canada
 **  Copyright (C) 2012      John Schember <john@nachtimwald.com>
 **  Copyright (C) 2012      Dave Heiland
 **  Copyright (C) 2012      Grant Drake
@@ -37,7 +37,7 @@ SearchEditorTreeView::SearchEditorTreeView(QWidget *parent)
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setSelectionBehavior(QAbstractItemView::SelectRows);
     setSortingEnabled(false);
-    setTabKeyNavigation(true);
+    setTabKeyNavigation(false);
     setAutoExpandDelay(200);
 }