diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerComposite.java b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerComposite.java
index f4a331e..64e9f50 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerComposite.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.nebula.grid/src/org/eclipse/emf/ecp/view/spi/table/nebula/grid/GridTableViewerComposite.java
@@ -119,6 +119,11 @@
 			public int getHeaderHeight() {
 				return getTableViewer().getGrid().getHeaderHeight();
 			}
+
+			@Override
+			public int getItemCount() {
+				return getTableViewer().getGrid().getItemCount();
+			}
 		};
 	}
 
diff --git a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
index 2485663..ca4c5ca 100644
--- a/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
+++ b/bundles/org.eclipse.emf.ecp.view.table.ui.swt/src/org/eclipse/emf/ecp/view/spi/table/swt/TableControlSWTRenderer.java
@@ -720,7 +720,7 @@
 		}
 		final int itemHeight = table.getItemHeight();
 		// show one empty row if table does not contain any items
-		final int itemCount = Math.max(table.getItemHeight(), 1);
+		final int itemCount = Math.max(table.getItemCount(), 1);
 		final int headerHeight = table.getHeaderVisible() ? table.getHeaderHeight() : 0;
 		// 4px needed as a buffer to avoid scrollbars
 		final int tableHeight = itemHeight * itemCount + headerHeight + 4;
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableControl.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableControl.java
index c8cfb83..21491f9 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableControl.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableControl.java
@@ -34,6 +34,14 @@
 	int getItemHeight();
 
 	/**
+	 * Returns the number of items contained in the receiver.
+	 *
+	 * @return the number of items
+	 * @since 1.12
+	 */
+	int getItemCount();
+
+	/**
 	 * Returns <code>true</code> if the receiver's header is visible,
 	 * and <code>false</code> otherwise.
 	 *
diff --git a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java
index 8202b57..67ce909 100644
--- a/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java
+++ b/bundles/org.eclipse.emfforms.swt.table/src/org/eclipse/emfforms/spi/swt/table/TableViewerComposite.java
@@ -123,6 +123,11 @@
 			public int getHeaderHeight() {
 				return getTableViewer().getTable().getHeaderHeight();
 			}
+
+			@Override
+			public int getItemCount() {
+				return getTableViewer().getTable().getItemCount();
+			}
 		};
 	}