diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index f077df824d3..54e03903d92 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -278,12 +278,16 @@ function isoToRightPanel($midmenuItem1) {
 
 function isoJsonToDetailsTab() {     
     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    if($midmenuItem1 == null) {
+        isoClearDetailsTab(); 
         return;
+    }
     
     var jsonObj = $midmenuItem1.data("jsonObj");
-    if(jsonObj == null)
-        return;          
+    if(jsonObj == null) {
+        isoClearDetailsTab(); 
+        return;    
+    }      
     
     var $thisTab = $("#right_panel_content #tab_content_details");  
     $thisTab.find("#tab_container").hide(); 
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index 1563bbc1de2..3b85297223e 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -286,13 +286,17 @@ function templateToRightPanel($midmenuItem1) {
 }
 
 function templateJsonToDetailsTab() {   
-     var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    if($midmenuItem1 == null)
+    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
+    if($midmenuItem1 == null) {
+        templateClearDetailsTab();
         return;
+    }
     
     var jsonObj = $midmenuItem1.data("jsonObj");
-    if(jsonObj == null)
+    if(jsonObj == null) {
+        templateClearDetailsTab();
         return;      
+    }
     
     var $thisTab = $("#right_panel_content").find("#tab_content_details");  
     $thisTab.find("#tab_container").hide(); 
@@ -408,6 +412,8 @@ function templateClearRightPanel() {
 
 function templateClearDetailsTab() {
     var $thisTab = $("#right_panel_content").find("#tab_content_details");   
+    
+    $thisTab.find("#grid_header_title").text(""); 
    
     $thisTab.find("#id").text("");
     $thisTab.find("#zonename").text("");
@@ -417,6 +423,9 @@ function templateClearDetailsTab() {
     
     $thisTab.find("#displaytext").text("");
     $thisTab.find("#displaytext_edit").val("");
+            
+    $thisTab.find("#hypervisor").text("");    
+    $thisTab.find("#templatetype").text("");     
         
 	$thisTab.find("#status").text("");