diff --git a/platform/commonUI/general/res/css/tree.css b/platform/commonUI/general/res/css/tree.css
index cf0d9d3983..97109f37a7 100644
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -273,92 +273,89 @@ ul.tree {
  *****************************************************************************/
 /* line 23, ../sass/search/_search.scss */
 .search-holder {
-  overflow-y: auto;
   padding-right: 5px;
-  top: 23px; }
-  /* line 37, ../sass/search/_search.scss */
+  top: 23px;
+  margin-top: 10px; }
+  /* line 36, ../sass/search/_search.scss */
   .search-holder .search .search-input {
-    margin-top: 10px;
     width: 100%; }
-  /* line 43, ../sass/search/_search.scss */
+  /* line 40, ../sass/search/_search.scss */
   .search-holder .search .search-scroll {
-    height: 100%;
-    overflow: auto; }
+    top: 25px;
+    overflow-y: auto; }
     /* line 47, ../sass/search/_search.scss */
-    .search-holder .search .search-scroll .results {
-      margin-top: 10px; }
-      /* line 51, ../sass/search/_search.scss */
-      .search-holder .search .search-scroll .results .search-result-item {
-        -moz-transition: background-color 0.25s;
-        -o-transition: background-color 0.25s;
-        -webkit-transition: background-color 0.25s;
-        transition: background-color 0.25s;
-        margin-bottom: 2px;
-        border-radius: 2px;
-        padding-top: 4px;
-        padding-bottom: 2px; }
+    .search-holder .search .search-scroll .results .search-result-item {
+      -moz-transition: background-color 0.25s;
+      -o-transition: background-color 0.25s;
+      -webkit-transition: background-color 0.25s;
+      transition: background-color 0.25s;
+      margin-bottom: 2px;
+      border-radius: 2px;
+      padding-top: 4px;
+      padding-bottom: 2px; }
+      /* line 61, ../sass/search/_search.scss */
+      .search-holder .search .search-scroll .results .search-result-item .label {
+        margin-left: 6px; }
         /* line 65, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .results .search-result-item .label {
-          margin-left: 6px; }
-          /* line 69, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item .label .title-label {
-            display: inline-block;
-            position: absolute;
-            left: 29px;
-            right: 5px;
-            font-size: .8em;
-            line-height: 17px;
-            width: auto;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap; }
+        .search-holder .search .search-scroll .results .search-result-item .label .title-label {
+          display: inline-block;
+          position: absolute;
+          left: 29px;
+          right: 5px;
+          font-size: .8em;
+          line-height: 17px;
+          width: auto;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          white-space: nowrap; }
+      /* line 87, ../sass/search/_search.scss */
+      .search-holder .search .search-scroll .results .search-result-item.selected {
+        background: #005177;
+        color: #fff; }
         /* line 91, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .results .search-result-item.selected {
-          background: #005177;
+        .search-holder .search .search-scroll .results .search-result-item.selected .view-control {
+          color: #0099cc; }
+        /* line 94, ../sass/search/_search.scss */
+        .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
           color: #fff; }
-          /* line 95, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item.selected .view-control {
-            color: #0099cc; }
-          /* line 98, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item.selected .label .type-icon {
-            color: #fff; }
-        /* line 105, ../sass/search/_search.scss */
-        .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
-          background: #404040;
-          color: #cccccc; }
-          /* line 108, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
-            display: block; }
-          /* line 111, ../sass/search/_search.scss */
-          .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
-            color: #33ccff; }
-    /* line 119, ../sass/search/_search.scss */
+      /* line 101, ../sass/search/_search.scss */
+      .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover {
+        background: #404040;
+        color: #cccccc; }
+        /* line 104, ../sass/search/_search.scss */
+        .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .context-trigger {
+          display: block; }
+        /* line 107, ../sass/search/_search.scss */
+        .search-holder .search .search-scroll .results .search-result-item:not(.selected):hover .icon {
+          color: #33ccff; }
+    /* line 115, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .load-icon {
       position: relative; }
-      /* line 121, ../sass/search/_search.scss */
+      /* line 117, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .load-icon.loading {
         pointer-events: none;
         margin-left: 6px; }
-        /* line 125, ../sass/search/_search.scss */
+        /* line 121, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .load-icon.loading .title-label {
           font-style: italic;
           font-size: .9em;
           opacity: 0.5;
           margin-left: 26px;
           line-height: 24px; }
-        /* line 135, ../sass/search/_search.scss */
+        /* line 131, ../sass/search/_search.scss */
         .search-holder .search .search-scroll .load-icon.loading .wait-spinner {
           margin-left: 6px; }
-      /* line 140, ../sass/search/_search.scss */
+      /* line 136, ../sass/search/_search.scss */
       .search-holder .search .search-scroll .load-icon:not(.loading) {
         cursor: pointer; }
-    /* line 145, ../sass/search/_search.scss */
+    /* line 141, ../sass/search/_search.scss */
     .search-holder .search .search-scroll .load-more-button {
       margin-top: 5px;
       margin-bottom: 5px;
       position: relative;
       left: 25%;
       width: 50%;
+      white-space: nowrap;
       height: 20px;
       line-height: 11px;
       font-size: 0.7em; }
diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss
index c808f12a4f..d97562d318 100644
--- a/platform/commonUI/general/res/sass/search/_search.scss
+++ b/platform/commonUI/general/res/sass/search/_search.scss
@@ -25,28 +25,24 @@
     $leftMargin: 6px;
     $rightPadding: 5px;
     
-    //position: relative;
-    overflow-y: auto;
     padding-right: $rightPadding;
     top: 23px;
     
+    // Align with the top of the divider bar, below create button 
+    margin-top: 10px;
+    
     .search {
-        //height: auto;
-        //overflow: auto;
         
         .search-input {
-            // Align with the top of the divider bar, below create button 
-            margin-top: 10px;
             width: 100%;
         }
         
         .search-scroll {
-            height: 100%;
-            overflow: auto;
+            // Spacing away from the search input
+            top: 25px;
+            overflow-y: auto;
             
             .results {
-                // Spacing away from the search input
-                margin-top: 10px;
 
                 .search-result-item {
                     // Include transitions (for the highlights)
@@ -151,15 +147,13 @@
                 position: relative;
                 left: 25%;
                 width: 50%;
+                white-space: nowrap;
 
                 // Make smallish button 
                 height: 20px;
                 line-height: 11px;
                 font-size: 0.7em;
             }
-            
-            // temp
-            //margin-bottom: 30px;
         }
     }
 }
\ No newline at end of file
diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html
index 9dba6ae5f2..a2ac8e8ac9 100644
--- a/platform/search/res/templates/search.html
+++ b/platform/search/res/templates/search.html
@@ -36,7 +36,7 @@
     </div>
     
     <!-- This div exists to determine scroll bar location -->
-    <div class="search-scroll">
+    <div class="search-scroll abs">
         
         <!-- Results list -->
         <div class="results">