diff --git a/resources/ui/carla_database.ui b/resources/ui/carla_database.ui
index 2844dc723..81f4dd05a 100644
--- a/resources/ui/carla_database.ui
+++ b/resources/ui/carla_database.ui
@@ -818,6 +818,14 @@
     </widget>
    </item>
   </layout>
+  <action name="act_focus_search">
+   <property name="text">
+    <string>Focus Text Search</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+F</string>
+   </property>
+  </action>
  </widget>
  <tabstops>
   <tabstop>lineEdit</tabstop>
@@ -852,5 +860,22 @@
  <resources>
   <include location="../resources.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>act_focus_search</sender>
+   <signal>triggered()</signal>
+   <receiver>lineEdit</receiver>
+   <slot>setFocus()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>448</x>
+     <y>23</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/source/frontend/carla_database.py b/source/frontend/carla_database.py
index 6c3009055..4afaa7a1c 100755
--- a/source/frontend/carla_database.py
+++ b/source/frontend/carla_database.py
@@ -1414,6 +1414,7 @@ class PluginDatabaseW(QDialog):
         # Set-up GUI
 
         self.ui.b_add.setEnabled(False)
+        self.addAction(self.ui.act_focus_search)
 
         if BINARY_NATIVE in (BINARY_POSIX32, BINARY_WIN32):
             self.ui.ch_bridged.setText(self.tr("Bridged (64bit)"))
@@ -2083,9 +2084,9 @@ class PluginDatabaseW(QDialog):
 
     # --------------------------------------------------------------------------------------------------------
 
-    def showEvent(self):
+    def showEvent(self, event):
         self.ui.lineEdit.setFocus()
-        QDialog.showEvent(self)
+        QDialog.showEvent(self, event)
 
     def done(self, r):
         QDialog.done(self, r)