diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js
index ae9fc179bb..cc20cf0774 100644
--- a/src/sunstone/public/app/sunstone.js
+++ b/src/sunstone/public/app/sunstone.js
@@ -930,7 +930,9 @@ define(function(require) {
         formPanelInstance.reset(context);
       }
 
-      _showFormPanel(tabId, formPanelId);
+      if (_formPanelVisible($("#"+tabId))){
+        _showFormPanel(tabId, formPanelId);
+      }
     }, 13)
   }
 
@@ -1032,6 +1034,10 @@ define(function(require) {
     return $(".sunstone-list", context).is(':visible');
   }
 
+  var _formPanelVisible = function(context) {
+    return $(".sunstone-form", context).is(':visible');
+  }
+
   var _rightInfoResourceId = function(context) {
     return $(".resource-id", context).text();
   }