diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 2fdf85eb..707afbef 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -30,8 +30,8 @@
                 .filtering-buttons
                   datalist(id='searchFields')
                     select(name='searchFields')
-                      option(ng-repeat='column in columns', ng-value='column.name + ": "', ng-bind='columnDefinitions[column.name].title | translate')
-
+                      option(ng-repeat='column in columns', ng-value='column.name + ": "',
+                        ng-bind='columnDefinitions[column.name].title | translate')
                   input(type='search', results='5', autosave='deviceFilter'
                     name='deviceFilter', ng-model='deviceFilter', ng-change='applyFilter(deviceFilter)',
                     ng-model-options='{debounce: 150}'
diff --git a/res/app/layout/stf-styles.css b/res/app/layout/stf-styles.css
index c5dda420..f2ae4225 100644
--- a/res/app/layout/stf-styles.css
+++ b/res/app/layout/stf-styles.css
@@ -384,3 +384,8 @@ a.active {
     left: 0;
     right: 0;
 }
+
+/* Hide datalist for non-supporting browsers */
+datalist {
+  display: none;
+}