diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index e3fd24b939..99feaa75ff 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -498,9 +498,11 @@ function getSelectedNodes(dataTable){
 function makeSelectOptions(dataTable,
                            id_col,name_col,
                            status_cols,
-                           bad_status_values){
+                           bad_status_values,no_empty_opt){
     var nodes = dataTable.fnGetData();
-    var select = '<option class="empty_value" value="">'+tr("Please select")+'</option>';
+    var select = "";
+    if (!no_empty_opt)
+        select = '<option class="empty_value" value="">'+tr("Please select")+'</option>';
     var array;
     for (var j=0; j<nodes.length;j++){
         var elem = nodes[j];
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index d27bfdf139..d49d800970 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -366,6 +366,12 @@ $(document).ready(function(){
         $('.action_blocks .action_list:visible',main_tabs_context).hide();
     });
 
+    //Close open panel
+    $('.close_dialog_link').live("click",function(){
+        hideDialog();
+        return false;
+    });
+
     //Start with the dashboard (supposing we have one).
     showTab('#dashboard_tab');