diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css
index 601c7617..3440cc7b 100755
--- a/server/public/assets/css/style.css
+++ b/server/public/assets/css/style.css
@@ -2739,6 +2739,19 @@ nav ul li:hover, nav ul li.active {
     }
 
 
+    .empty-inner-results {
+        height: 100vh !important;
+    }
+
+    #empty-results {
+        height: calc(100vh - 112px);
+    }
+
+    .search_input {
+        padding-right: 50px;
+        width: calc(100vw - 78px);
+    }
+
     .playlist-tabs-loggedIn, .playlist-tabs {
         width: calc(100%) !important;
     }
@@ -3041,6 +3054,9 @@ nav ul li:hover, nav ul li.active {
         margin-left: -36px;
         margin-top: 0;
         height: 56px;
+        position: absolute;
+        right: 15px;
+        top: 50px;
     }
 
     .title-container{
diff --git a/server/public/assets/js/search.js b/server/public/assets/js/search.js
index 2566b7e2..1b5c796d 100755
--- a/server/public/assets/js/search.js
+++ b/server/public/assets/js/search.js
@@ -62,8 +62,9 @@ var Search = {
                     var nextPageToken = response.nextPageToken;
                     var prevPageToken = response.prevPageToken;
                     if(response.items.length === 0) {
-
-                        $("<div style='display:none;' id='inner-results'>"+empty_results_html+"</div>").appendTo($("#results")).show("blind", 83.33);
+                        $("#results").empty();
+                        $("#results").css("display", "block");
+                        $("<div style='display:none;' id='inner-results' class='empty-inner-results'>"+empty_results_html+"</div>").appendTo($("#results")).show("blind", 83.33);
                         if(Helper.contains($(".search_loader_spinner").attr("class").split(" "), "active"))
                         $(".search_loader_spinner").removeClass("active");