diff --git a/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/resources/i18n/WorkbenchConstants.java b/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/resources/i18n/WorkbenchConstants.java
index e9322d3a85..014c245eb7 100644
--- a/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/resources/i18n/WorkbenchConstants.java
+++ b/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/resources/i18n/WorkbenchConstants.java
@@ -30,6 +30,8 @@ public interface WorkbenchConstants
 
     String maximizePanel();
 
+    String minimizePanel();
+
     String expandToolbar();
 
     String collapseToolbar();
diff --git a/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/workbench/widgets/panel/MaximizeToggleButton.java b/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/workbench/widgets/panel/MaximizeToggleButton.java
index 4d65fb693c..972894d9b2 100644
--- a/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/workbench/widgets/panel/MaximizeToggleButton.java
+++ b/uberfire-workbench/uberfire-workbench-client/src/main/java/org/uberfire/client/workbench/widgets/panel/MaximizeToggleButton.java
@@ -1,5 +1,6 @@
 package org.uberfire.client.workbench.widgets.panel;
 
+import org.uberfire.client.resources.i18n.WorkbenchConstants;
 import org.uberfire.mvp.Command;
 
 import com.github.gwtbootstrap.client.ui.Button;
@@ -28,6 +29,7 @@ public MaximizeToggleButton() {
         setIcon( IconType.CHEVRON_UP );
         setIconSize( IconSize.SMALL );
         setSize( ButtonSize.MINI );
+        setTitle( WorkbenchConstants.INSTANCE.maximizePanel() );
         addClickHandler( new ClickHandler() {
             @Override
             public void onClick( ClickEvent event ) {
@@ -45,10 +47,12 @@ public void click() {
         if ( wasMaximized ) {
             if ( unmaximizeCommand != null ) {
                 unmaximizeCommand.execute();
+                setTitle( WorkbenchConstants.INSTANCE.maximizePanel() );
             }
         } else {
             if ( maximizeCommand != null ) {
                 maximizeCommand.execute();
+                setTitle( WorkbenchConstants.INSTANCE.minimizePanel() );
             }
         }
     }
@@ -100,8 +104,10 @@ public void setMaximized( boolean maximized ) {
         this.maximized = maximized;
         if ( maximized ) {
             setIcon( IconType.CHEVRON_DOWN );
+            setTitle( WorkbenchConstants.INSTANCE.minimizePanel() );
         } else {
             setIcon( IconType.CHEVRON_UP );
+            setTitle( WorkbenchConstants.INSTANCE.maximizePanel() );
         }
     }
 }
diff --git a/uberfire-workbench/uberfire-workbench-client/src/main/resources/org/uberfire/client/resources/i18n/WorkbenchConstants.properties b/uberfire-workbench/uberfire-workbench-client/src/main/resources/org/uberfire/client/resources/i18n/WorkbenchConstants.properties
index 579f93af40..68e883c116 100644
--- a/uberfire-workbench/uberfire-workbench-client/src/main/resources/org/uberfire/client/resources/i18n/WorkbenchConstants.properties
+++ b/uberfire-workbench/uberfire-workbench-client/src/main/resources/org/uberfire/client/resources/i18n/WorkbenchConstants.properties
@@ -1,4 +1,5 @@
 maximizePanel=Maximize panel to fit full screen
+minimizePanel=Minimize panel to its previous size
 expandToolbar=Expand Toolbar
 collapseToolbar=Collapse Toolbar