diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java b/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
index b5b6bd993a7..69bbd02f11d 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/TableView.java
@@ -41,6 +41,7 @@
 import org.apache.hop.ui.core.gui.GuiResource;
 import org.apache.hop.ui.hopgui.HopGui;
 import org.apache.hop.ui.hopgui.TextSizeUtilFacade;
+import org.apache.hop.ui.util.EnvironmentUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
 import org.eclipse.swt.custom.CCombo;
@@ -2235,6 +2236,11 @@ private void setColumnWidthBasedOnTextField( final int colnr, final boolean useV
     int strmax = TextSizeUtilFacade.textExtent(str).x + 20;
     int colmax = tablecolumn[ colnr ].getWidth();
     if ( strmax > colmax ) {
+      if (!EnvironmentUtils.getInstance().isWeb()) {
+        if ( Const.isOSX() || Const.isLinux() ) {
+          strmax *= 1.4;
+        }
+      }
       tablecolumn[ colnr ].setWidth( strmax + 30 );
 
       // On linux, this causes the text to select everything...