diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css
index 35c1b1d17e..d7e6e0fc84 100644
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -272,9 +272,9 @@ ul.tree {
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 /* line 27, ../sass/search/_search.scss */
-.search .searchbar {
+.search .search-input {
   width: 100%;
-  margin-top: 20px; }
+  margin-top: 10px; }
 /* line 32, ../sass/search/_search.scss */
 .search .results {
   margin-top: 10px; }
diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss
index bee4f0fc2f..c2153b54d7 100644
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -24,9 +24,9 @@
     $iconWidth: 20px;
     $leftMargin: 6px;
     
-    .searchbar {
+    .search-input {
         width: 100%;
-        margin-top: 20px;
+        margin-top: 10px;
     }
     
 	.results {
diff --git a/platform/features/search/res/templates/search.html b/platform/features/search/res/templates/search.html
index 7201f2d9af..1577730044 100644
--- a/platform/features/search/res/templates/search.html
+++ b/platform/features/search/res/templates/search.html
@@ -23,7 +23,7 @@
       ng-controller="SearchController as controller">
     <!-- Search bar input -->
     <div>
-        <input class="searchbar"
+        <input class="search-input"
                id="searchbarinput" 
                type="text" 
                value=""
diff --git a/platform/features/search/src/providers/ElasticsearchSearchProvider.js b/platform/features/search/src/providers/ElasticsearchSearchProvider.js
index 427e44ebf6..88e4342893 100644
--- a/platform/features/search/src/providers/ElasticsearchSearchProvider.js
+++ b/platform/features/search/src/providers/ElasticsearchSearchProvider.js
@@ -159,24 +159,31 @@ define(
                 // Get the user input 
                 searchTerm = document.getElementById(inputID).value;
                 
-                // Process search term
-                searchTerm = processSearchTerm(searchTerm);
-                
-                // Create the query to elasticsearch
-                esQuery = ROOT + "/_search/?q=" + searchTerm +
-                                 "&size=" + maxResults;
-                if (timeout) {
-                    esQuery += "&timeout=" + timeout;
+                // If the user input is empty, we want to have no search results.
+                if (searchTerm !== '') {
+                    // Process search term
+                    searchTerm = processSearchTerm(searchTerm);
+
+                    // Create the query to elasticsearch
+                    esQuery = ROOT + "/_search/?q=" + searchTerm +
+                                     "&size=" + maxResults;
+                    if (timeout) {
+                        esQuery += "&timeout=" + timeout;
+                    }
+
+                    // Get the data...
+                    return $http({
+                        method: "GET",
+                        url: esQuery
+                    }).then(function (rawResults) {
+                        // ...then process the data 
+                        return processResults(rawResults, timestamp);
+                    });
+                } else {
+                    latestResults = [];
+                    lastSearchTimestamp = timestamp;
+                    return latestResults;
                 }
-                
-                // Get the data...
-                return $http({
-                    method: "GET",
-                    url: esQuery
-                }).then(function (rawResults) {
-                    // ...then process the data 
-                    return processResults(rawResults, timestamp);
-                });
             }
             
             return {
diff --git a/platform/features/search/src/workers/GenericSearchWorker.js b/platform/features/search/src/workers/GenericSearchWorker.js
index 5674ce9ac4..8074e57cc8 100644
--- a/platform/features/search/src/workers/GenericSearchWorker.js
+++ b/platform/features/search/src/workers/GenericSearchWorker.js
@@ -135,12 +135,16 @@
             terms = convertToTerms(input), 
             timesToLoop = Math.min(indexedItems.length, data.maxNumber);
         
-        for (var i = 0; i < timesToLoop; i++) {
-            var score = scoreItem(indexedItems[i], input, terms);
-            if (score > 0) {
-                results[indexedItems[i].id] = {
-                    score: score
-                };
+        
+        // If the user input is empty, we want to have no search results.
+        if (input !== '') {
+            for (var i = 0; i < timesToLoop; i++) {
+                var score = scoreItem(indexedItems[i], input, terms);
+                if (score > 0) {
+                    results[indexedItems[i].id] = {
+                        score: score
+                    };
+                }
             }
         }