diff --git a/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift b/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift
index 42ff8d1..f2c92e0 100644
--- a/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift
+++ b/Delta/Database/OpenVGDB/GamesDatabaseBrowserViewController.swift
@@ -70,6 +70,13 @@ class GamesDatabaseBrowserViewController: UITableViewController
         
         self.updatePlaceholderView()
     }
+    
+    override func viewDidAppear(_ animated: Bool)
+    {
+        super.viewDidAppear(animated)
+        
+        self.dataSource.searchController.isActive = true
+    }
 
     override func didReceiveMemoryWarning()
     {
@@ -197,6 +204,13 @@ extension GamesDatabaseBrowserViewController
 
 extension GamesDatabaseBrowserViewController: UISearchControllerDelegate
 {
+    func didPresentSearchController(_ searchController: UISearchController)
+    {
+        DispatchQueue.main.async {
+            searchController.searchBar.becomeFirstResponder()
+        }
+    }
+    
     func willDismissSearchController(_ searchController: UISearchController)
     {
         // Manually set items to empty array to prevent crash if user dismissses searchController while scrolling