diff --git a/public/css/grocy.css b/public/css/grocy.css
index e95d10f6..196ed321 100644
--- a/public/css/grocy.css
+++ b/public/css/grocy.css
@@ -239,6 +239,10 @@ input::-webkit-inner-spin-button {
 	font-size: 125%;
 }
 
+.input-group > .form-control:focus {
+	z-index: inherit;
+}
+
 /* Third party component customizations - DataTables */
 .dataTable td {
 	vertical-align: middle !important;
diff --git a/views/components/barcodescanner.blade.php b/views/components/barcodescanner.blade.php
index 7a6ca411..502d201b 100644
--- a/views/components/barcodescanner.blade.php
+++ b/views/components/barcodescanner.blade.php
@@ -15,7 +15,6 @@
 			right: 0;
 			margin-top: 4px;
 			margin-right: 5px;
-			z-index: 1000;
 			cursor: pointer;
 		}