diff --git a/changelog.txt b/changelog.txt
index b382372..437dec2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,7 @@ Version 0.2.9 (2018-06-)
 - Open file by URL (Issue #95) @danielperna84
 - Added ENFORCE_BASEPATH option (Issue #68) @danielperna84
 - Cosmetic fix for scaled viewports @danielperna84
+- Added search-function for entities (Issue #99) @danielperna84
 
 Version 0.2.8 (2018-04-23)
 - Updated CDN libraries @jmart518
diff --git a/configurator.py b/configurator.py
index 6e7ed49..8955175 100755
--- a/configurator.py
+++ b/configurator.py
@@ -1669,6 +1669,10 @@ INDEX = Template(r"""<!DOCTYPE html>
                 <select id="events" onchange="insert(this.value)"></select>
                 <label>Events</label>
             </div>
+            <div class="input-field col s12">
+                <input type="text" id="entities-search" class="autocomplete" placeholder="sensor.example">
+                <label>Search entity</label>
+            </div>
             <div class="input-field col s12">
                 <select id="entities" onchange="insert(this.value)"></select>
                 <label>Entities</label>
@@ -1768,6 +1772,10 @@ INDEX = Template(r"""<!DOCTYPE html>
               <select id="events_side" onchange="insert(this.value)"></select>
               <label>Events</label>
             </div>
+            <div class="input-field col s12">
+                <input type="text" id="entities-search_side" class="autocomplete" placeholder="sensor.example">
+                <label>Search entity</label>
+            </div>
             <div class="input-field col s12">
               <select id="entities_side" onchange="insert(this.value)"></select>
               <label>Entities</label>
@@ -2262,6 +2270,28 @@ INDEX = Template(r"""<!DOCTYPE html>
         $(document).on('click', '.drag-target', function(){$('.button-collapse').sideNav('hide');})
         listdir('.');
         document.getElementById('savePrompt').checked = get_save_prompt();
+        var entities_search = new Object();
+        if (states_list) {
+            for (var i = 0; i < states_list.length; i++) {
+                entities_search[states_list[i].attributes.friendly_name + ' (' + states_list[i].entity_id + ')'] = null;
+            }
+        }
+        $('#entities-search').autocomplete({
+            data: entities_search,
+            limit: 40,
+            onAutocomplete: function(val) {
+                insert(val.split("(")[1].split(")")[0]);
+            },
+            minLength: 1,
+        });
+        $('#entities-search_side').autocomplete({
+            data: entities_search,
+            limit: 40,
+            onAutocomplete: function(val) {
+                insert(val.split("(")[1].split(")")[0]);
+            },
+            minLength: 1,
+        });
     });
 </script>
 <script type="text/javascript">
diff --git a/dev.html b/dev.html
index 15ec45a..cb186ce 100644
--- a/dev.html
+++ b/dev.html
@@ -1579,6 +1579,10 @@
                 <select id="events" onchange="insert(this.value)"></select>
                 <label>Events</label>
             </div>
+            <div class="input-field col s12">
+                <input type="text" id="entities-search" class="autocomplete" placeholder="sensor.example">
+                <label>Search entity</label>
+            </div>
             <div class="input-field col s12">
                 <select id="entities" onchange="insert(this.value)"></select>
                 <label>Entities</label>
@@ -1678,6 +1682,10 @@
               <select id="events_side" onchange="insert(this.value)"></select>
               <label>Events</label>
             </div>
+            <div class="input-field col s12">
+                <input type="text" id="entities-search_side" class="autocomplete" placeholder="sensor.example">
+                <label>Search entity</label>
+            </div>
             <div class="input-field col s12">
               <select id="entities_side" onchange="insert(this.value)"></select>
               <label>Entities</label>
@@ -2172,6 +2180,28 @@
         $(document).on('click', '.drag-target', function(){$('.button-collapse').sideNav('hide');})
         listdir('.');
         document.getElementById('savePrompt').checked = get_save_prompt();
+        var entities_search = new Object();
+        if (states_list) {
+            for (var i = 0; i < states_list.length; i++) {
+                entities_search[states_list[i].attributes.friendly_name + ' (' + states_list[i].entity_id + ')'] = null;
+            }
+        }
+        $('#entities-search').autocomplete({
+            data: entities_search,
+            limit: 40,
+            onAutocomplete: function(val) {
+                insert(val.split("(")[1].split(")")[0]);
+            },
+            minLength: 1,
+        });
+        $('#entities-search_side').autocomplete({
+            data: entities_search,
+            limit: 40,
+            onAutocomplete: function(val) {
+                insert(val.split("(")[1].split(")")[0]);
+            },
+            minLength: 1,
+        });
     });
 </script>
 <script type="text/javascript">
