diff --git a/migration/i2.0z/oracle/201407011455_IDEMPIERE-2029.sql b/migration/i2.0z/oracle/201407011455_IDEMPIERE-2029.sql
new file mode 100644
index 0000000000..4aef955950
--- /dev/null
+++ b/migration/i2.0z/oracle/201407011455_IDEMPIERE-2029.sql
@@ -0,0 +1,10 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Jul 1, 2014 2:53:42 PM SGT
+-- IDEMPIERE-2029 Performance gadgets portlet is not sized correctly on login
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Value,AD_SysConfig_UU,Updated,Created,AD_Org_ID,CreatedBy,IsActive,UpdatedBy,Name,AD_Client_ID,EntityType) VALUES (200057,'C','500','70b3fe79-cbe4-40d5-89b4-a4c5c9c5a845',TO_DATE('2014-07-01 14:53:41','YYYY-MM-DD HH24:MI:SS'),TO_DATE('2014-07-01 14:53:41','YYYY-MM-DD HH24:MI:SS'),0,100,'Y',100,'ZK_DASHBOARD_PERFORMANCE_TIMEOUT',0,'D')
+;
+
+SELECT register_migration_script('201407011455_IDEMPIERE-2029.sql') FROM dual
+;
\ No newline at end of file
diff --git a/migration/i2.0z/postgresql/201407011455_IDEMPIERE-2029.sql b/migration/i2.0z/postgresql/201407011455_IDEMPIERE-2029.sql
new file mode 100644
index 0000000000..3279c0b2b8
--- /dev/null
+++ b/migration/i2.0z/postgresql/201407011455_IDEMPIERE-2029.sql
@@ -0,0 +1,7 @@
+-- Jul 1, 2014 2:53:42 PM SGT
+-- IDEMPIERE-2029 Performance gadgets portlet is not sized correctly on login
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,ConfigurationLevel,Value,AD_SysConfig_UU,Updated,Created,AD_Org_ID,CreatedBy,IsActive,UpdatedBy,Name,AD_Client_ID,EntityType) VALUES (200057,'C','500','70b3fe79-cbe4-40d5-89b4-a4c5c9c5a845',TO_TIMESTAMP('2014-07-01 14:53:41','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2014-07-01 14:53:41','YYYY-MM-DD HH24:MI:SS'),0,100,'Y',100,'ZK_DASHBOARD_PERFORMANCE_TIMEOUT',0,'D')
+;
+
+SELECT register_migration_script('201407011455_IDEMPIERE-2029.sql') FROM dual
+;
\ No newline at end of file
diff --git a/org.adempiere.base/src/org/compiere/model/MSysConfig.java b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
index 1bb1e7b20d..678aa9fc8d 100644
--- a/org.adempiere.base/src/org/compiere/model/MSysConfig.java
+++ b/org.adempiere.base/src/org/compiere/model/MSysConfig.java
@@ -125,6 +125,7 @@ public class MSysConfig extends X_AD_SysConfig
     public static final String ZK_BROWSER_ICON = "ZK_BROWSER_ICON";
     public static final String ZK_BROWSER_TITLE = "ZK_BROWSER_TITLE";
     public static final String ZK_BUTTON_STYLE = "ZK_BUTTON_STYLE";
+	public static final String ZK_DASHBOARD_PERFORMANCE_TIMEOUT = "ZK_DASHBOARD_PERFORMANCE_TIMEOUT";
     public static final String ZK_DASHBOARD_REFRESH_INTERVAL = "ZK_DASHBOARD_REFRESH_INTERVAL";
 	public static final String ZK_DECIMALBOX_PROCESS_DOTKEYPAD = "ZK_DECIMALBOX_PROCESS_DOTKEYPAD";
     public static final String ZK_DESKTOP_CLASS = "ZK_DESKTOP_CLASS";
@@ -682,4 +683,4 @@ public class MSysConfig extends X_AD_SysConfig
 			+"]";
 	}
 
-}	//	MSysConfig;
\ No newline at end of file
+}	//	MSysConfig;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java
index 55e5783883..c5f1b41d2f 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/DPPerformance.java
@@ -15,6 +15,8 @@ package org.adempiere.webui.dashboard;
 
 import org.adempiere.webui.apps.graph.WPAPanel;
 import org.adempiere.webui.util.ServerPushTemplate;
+import org.compiere.model.MSysConfig;
+import org.compiere.util.Env;
 import org.zkoss.zk.au.out.AuScript;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
@@ -81,9 +83,10 @@ public class DPPerformance extends DashboardPanel {
 		removeAttribute(ON_POST_RENDER_ATTR);
 		if (this.getFirstChild() != null)
 		{
+			int timeout = MSysConfig.getIntValue(MSysConfig.ZK_DASHBOARD_PERFORMANCE_TIMEOUT, 500, Env.getAD_Client_ID(Env.getCtx()));
 			Component grid = this.getFirstChild().getFirstChild();
 			String script = "setTimeout(function() { var grid = jq('#" + grid.getUuid() + "');";
-			script = script + "grid.parent().height(grid.css('height'));}, 500);";
+			script = script + "grid.parent().height(grid.css('height'));}, " + timeout + ");";
 			if (Executions.getCurrent() != null)
 				Clients.response(new AuScript(script));
 			this.getFirstChild().invalidate();