diff --git a/source/Ox.UI/js/Panel/Ox.CollapsePanel.js b/source/Ox.UI/js/Panel/Ox.CollapsePanel.js
index df349add..b933bbda 100644
--- a/source/Ox.UI/js/Panel/Ox.CollapsePanel.js
+++ b/source/Ox.UI/js/Panel/Ox.CollapsePanel.js
@@ -88,13 +88,16 @@ Ox.CollapsePanel = function(options, self) {
         var marginTop;
         self.options.collapsed = !self.options.collapsed;
         marginTop = self.options.collapsed ? -that.$content.height() : 0;
-        !self.options.collapsed && that.css({
-            marginTop: -that.$content.height() + 'px'
-        }).show();
+        if (!self.options.collapsed) {
+            that.css({
+                marginTop: -that.$content.height() + 'px'
+            });
+            that.$content.show();
+        }
         that.$content.animate({
             marginTop: marginTop + 'px'
         }, 250, function() {
-            self.options.collapsed && that.hide();
+            self.options.collapsed && that.$content.hide();
         });
         that.triggerEvent('toggle', {
             collapsed: self.options.collapsed