diff --git a/public/javascripts/traveler-config.js b/public/javascripts/traveler-config.js
index 1ab0e15a..d3e4660c 100644
--- a/public/javascripts/traveler-config.js
+++ b/public/javascripts/traveler-config.js
@@ -176,24 +176,24 @@ $(function() {
         });
         devices.initialize();
       }
+
+      $('#newDevice').typeahead(
+        {
+          minLength: 1,
+          highlight: true,
+          hint: true,
+        },
+        {
+          name: 'devices',
+          limit: 20,
+          display: 'inventoryId',
+          source: devices,
+        }
+      );
     } else if (!devices) {
       devices = [];
     }
 
-    $('#newDevice').typeahead(
-      {
-        minLength: 1,
-        highlight: true,
-        hint: true,
-      },
-      {
-        name: 'devices',
-        limit: 20,
-        display: 'inventoryId',
-        source: devices,
-      }
-    );
-
     $('#confirm').click(function(confirmE) {
       confirmE.preventDefault();
       if (