diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 948b88bba..c06fc1bb0 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -287,7 +287,7 @@ var orbitDesktop = function(dom){
 
   this.layout_data = function(h){
     var $e;  
-    var column_container,layout, base_width , no_of_entries, pagination_link , pagination_variable;   
+    var column_container,layout, base_width , no_of_entries = 0, pagination_link , pagination_variable;   
     o.paging = true;
     this.layout_data.generate_layout_html = function(l){
       $e = $("<div></div>");
@@ -305,32 +305,36 @@ var orbitDesktop = function(dom){
           no_of_entries = (typeof column_container.attr("per-column") != "undefined"? parseInt(column_container.attr("per-column")) : 4);
           var height_percentage = 100/no_of_entries;
           var entries = column_container.find("li[item=true]"),x = 0;
-          entries.each(function(i,li){
-            if(x == 0){
-              column = $("<div class='column type_datalist' style='width:"+base_width+"px'><ul></ul></div");
-              total_columns++;
-            }
-            $(li).addClass("datalist_item").height(height_percentage+"%");
-            column.find("ul").eq(0).append(li);
-            x++;
-            if(x == no_of_entries){
-              x = 0;
+          if(entries.length != 0){
+            entries.each(function(i,li){
+              if(x == 0){
+                column = $("<div class='column type_datalist' style='width:"+base_width+"px'><ul></ul></div");
+                total_columns++;
+              }
+              $(li).addClass("datalist_item").height(height_percentage+"%");
+              column.find("ul").eq(0).append(li);
+              x++;
+              if(x == no_of_entries){
+                x = 0;
+                temp_div.append(column);
+              }
+            })
+            if(x != 0){
               temp_div.append(column);
             }
-          })
-          if(x != 0){
-            temp_div.append(column);
           }
         break;
         case "column":
           var entries = column_container.find("div[column=true]"),x = 0,column;
-          entries.each(function(i,ul){
+          if(entries.length!=0){
+            entries.each(function(i,ul){
               column = $("<div class='column type_column' style='width:"+base_width+"px'></div");
               total_columns++;
               column.append(ul);
               x++;
               temp_div.append(column);
             })
+          }
         break;
       }
       var w = (!isNaN(base_width) ? base_width * total_columns : null);
@@ -855,10 +859,23 @@ var orbitDesktop = function(dom){
           searchArray = $("div#app_manager .element:containsi("+$(this).val()+")");
           if(searchArray.length>0){
             $("div#app_manager #seperator").show();
+            var i = 0;
+            var $column;
             searchArray.each(function(){
+              i++;
+              if(i == 1){
+                $column = $("<div style='width:120px; float:left;'></div>");
+              }
               var $newelement = $('<div class="search element w1 h1 hp vp thmc2" data-category="desktop">'+$(this).html()+'</div>');
-              $("div#app_manager .search_result").prepend($newelement);
+              $column.append($newelement);
+              if(i == 4){
+                $("div#app_manager .search_result").append($column);
+                i = 0;
+              }
             })
+            if(i != 0){
+              $("div#app_manager .search_result").append($column);
+            }
           }
         }else{$("div#app_manager #seperator").hide();$("div#app_manager .search_result").empty();}
       }).blur(function(){$(this).val("Search");});