diff --git a/index.html b/index.html
index fb86e5f..9617985 100644
--- a/index.html
+++ b/index.html
@@ -49,7 +49,6 @@
                 </div>
                 <div class="mdl-select">
                     <select id="selectHost">
-                        <option value="">No history available</option>
                     </select>
                 </div>
                 <div class="button-holder">
diff --git a/static/js/index.js b/static/js/index.js
index 948e0cc..3dd651b 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -151,6 +151,7 @@ function hostChosen() {
             hosts.push(target);
             saveHosts();
             $('#GFEHostIPField').val(''); // eat the contents of the textbox
+            $('#GFEHostIPField').parent().removeClass('is-dirty');
         }
         showApps();
     });
@@ -405,9 +406,6 @@ function onWindowLoad(){
         // load previously connected hosts
         chrome.storage.sync.get('hosts', function(previousValue) {
             hosts = previousValue.hosts != null ? previousValue.hosts : [];
-            if ($('#selectHost')[0].length > 0) {
-                $('#selectHost')[0].remove($('#selectHost')[0].selectedIndex);
-            }
             for(var i = 0; i < hosts.length; i++) { // programmatically add each new host.
                 var opt = document.createElement('option');
                 opt.appendChild(document.createTextNode(hosts[i]));