diff --git a/plugins/Dashboard/javascripts/dashboardWidget.js b/plugins/Dashboard/javascripts/dashboardWidget.js
index 9502ba68ece92911f7366fb0daf2c846ac027440..33adbc0a9bc1d01166bdd7ec949d3599ee7f7134 100755
--- a/plugins/Dashboard/javascripts/dashboardWidget.js
+++ b/plugins/Dashboard/javascripts/dashboardWidget.js
@@ -91,7 +91,6 @@
         maximise: function () {
             this.isMaximised = true;
 
-            $('.button#close, .button#maximise', this.element).hide();
             this.element.before('<div id="' + this.uniqueId + '-placeholder" class="widgetPlaceholder widget"> </div>');
             $('#' + this.uniqueId + '-placeholder').height(this.element.height());
             $('#' + this.uniqueId + '-placeholder').width(this.element.width() - 16);
@@ -108,7 +107,6 @@
                 autoOpen: true,
                 close: function (event, ui) {
                     self.isMaximised = false;
-                    $('.button#minimise, .button#refresh', $(this)).hide();
                     $('body').off('.dashboardWidget');
                     $(this).dialog("destroy");
                     $('#' + self.uniqueId + '-placeholder').replaceWith(this);
@@ -184,7 +182,9 @@
         },
 
         /**
-         * TODO
+         * Get widget parameters
+         *
+         * @param {object} parameters
          */
         getParameters: function () {
             return this.widgetParameters;
@@ -213,22 +213,17 @@
                     if (!self.isMaximised) {
                         $(this).addClass('widgetHover');
                         $('.widgetTop', this).addClass('widgetTopHover');
-                        $('.button#close, .button#maximise', this).show();
-                        if (!$('.widgetContent', this).hasClass('hidden')) {
-                            $('.button#minimise, .button#refresh', this).show();
-                        }
                     }
                 })
                 .on('mouseleave.dashboardWidget', function () {
                     if (!self.isMaximised) {
                         $(this).removeClass('widgetHover');
                         $('.widgetTop', this).removeClass('widgetTopHover');
-                        $('.button#close, .button#maximise, .button#minimise, .button#refresh', this).hide();
                     }
                 });
 
             if (this.options.isHidden) {
-                $('.widgetContent', widgetElement).toggleClass('hidden');
+                $('.widgetContent', widgetElement).toggleClass('hidden').closest('.widget').toggleClass('hiddenContent');
             }
 
             $('.button#close', widgetElement)
@@ -244,9 +239,8 @@
                     if ($('.widgetContent', $(this).parents('.widget')).hasClass('hidden')) {
                         self.isMaximised = false;
                         self.options.isHidden = false;
-                        $('.widgetContent', $(this).parents('.widget')).removeClass('hidden');
-                        $('.button#minimise, .button#refresh', $(this).parents('.widget')).show();
-                        $(this).parents('.widget').find('div.piwik-graph').trigger('resizeGraph');
+                        $(this).closest('.widget').removeClass('hiddenContent').find('.widgetContent').removeClass('hidden');
+                        $(this).closest('.widget').find('div.piwik-graph').trigger('resizeGraph');
                         self.options.onChange();
                         $('.widgetContent', widgetElement).trigger('widget:minimise');
                     } else {
@@ -257,8 +251,7 @@
             $('.button#minimise', widgetElement)
                 .on('click.dashboardWidget', function (ev) {
                     if (!self.isMaximised) {
-                        $('.widgetContent', $(this).parents('.widget')).addClass('hidden');
-                        $('.button#minimise, .button#refresh', $(this).parents('.widget')).hide();
+                        $('.widgetContent', $(this).closest('.widget').addClass('hiddenContent')).addClass('hidden');
                         self.options.isHidden = true;
                         self.options.onChange();
                     } else {
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index e87d03d1937a5ec8c310bac56f32c596e6f46990..e02c4f16d1be778e55f36ad66c6b8e5a26177b1e 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -144,7 +144,6 @@
 
 #close.button, #maximise.button, #minimise.button, #refresh.button {
   float: right;
-  display: none;
   margin: 6px 6px 0 0;
 }
 
@@ -522,3 +521,23 @@ div.widgetpreview-preview {
   }
 
 }
+
+.widgetTop .button {
+  display:none;
+}
+
+.widgetTop.widgetTopHover .button {
+  display:block;
+}
+
+.widget.hiddenContent .widgetTop.widgetTopHover {
+  .button#minimise,.button#refresh {
+    display:none;
+  }
+}
+
+.ui-dialog .widget {
+  .button#close,.button#maximise {
+    display:none;
+  }
+}
\ No newline at end of file