diff --git a/ui/scripts/events.js b/ui/scripts/events.js
index 1c89b58346c..3b6874c6274 100644
--- a/ui/scripts/events.js
+++ b/ui/scripts/events.js
@@ -257,8 +257,6 @@
                        }
 
                        });
-                    $(window).trigger('cloudStack.fullRefresh');
-
                 }
               },
 
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 0731dda8928..4b520f934ba 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -304,7 +304,16 @@
           }
 
           if($detailView.data("list-view-row") != null) {
-            $detailView.data("list-view-row").remove();
+            var $row = $detailView.data('list-view-row');
+            var $tbody = $row.closest('tbody');
+
+            $row.remove();
+            if(!$tbody.find('tr').size()) {
+              $("<tr>").addClass('empty').append(
+                $("<td>").html(_l('label.no.data'))
+              ).appendTo($tbody);
+            }
+            $tbody.closest('table').dataTable('refresh');
           }
         }
       });