diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java
index 4f4ac9e3b5..35bf403dd5 100644
--- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java
+++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java
@@ -164,7 +164,7 @@ public class UIResizableContainer extends JPanel {
      * @param toolPaneY
      */
     public void setLastToolPaneY(int toolPaneY) {
-        this.toolPaneY = toolPaneY;
+        this.toolPaneY = Math.min(toolPaneY, (getHeight() - toolPaneHeight));
     }
 
     /**