diff --git a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java
index 6c0c942a3..2d02634e6 100644
--- a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java
+++ b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java
@@ -584,7 +584,11 @@ private void comboEvent(final Event event) {
 			if (focusControl == arrow || focusControl == table) {
 				return;
 			}
-			if (!isDropped()) {
+			if (isDropped()) {
+				if (isWindows()) {
+					table.setFocus();
+				}
+			} else {
 				text.setFocus();
 			}
 			break;
@@ -597,6 +601,10 @@ private void comboEvent(final Event event) {
 		}
 	}
 
+	private boolean isWindows() {
+		return System.getProperty("os.name").indexOf("indows") != -1;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 */