diff --git a/lib/widget/search.dart b/lib/widget/search.dart
index 1a59237e..c2bc63f5 100644
--- a/lib/widget/search.dart
+++ b/lib/widget/search.dart
@@ -4,7 +4,6 @@ import "package:flutter/material.dart";
 
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 
-import "package:inventree/inventree/company.dart";
 import "package:inventree/inventree/purchase_order.dart";
 import "package:inventree/widget/part_list.dart";
 import "package:inventree/widget/purchase_order_list.dart";
@@ -71,7 +70,7 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
       return false;
     }
 
-    return nSearchResults < 6;
+    return nSearchResults < 5;
   }
 
   int nSearchResults = 0;
@@ -405,8 +404,11 @@ class _SearchDisplayState extends RefreshableState<SearchWidget> {
       }
     }
 
-    return tiles;
+    if (!_focusNode.hasFocus) {
+      _focusNode.requestFocus();
+    }
 
+    return tiles;
   }
 
   @override