diff --git a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java
index 687eedf53..70e5ae806 100644
--- a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java
+++ b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java
@@ -19,6 +19,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -56,6 +57,7 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
 import javax.swing.table.TableModel;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -404,23 +406,24 @@ public class GUIUtil {
 
 	public static void rememberTableColumnWidths(final JTable table, String keyName) {
 		final String key = keyName == null ? table.getClass().getName() : keyName;
-		for (int i = 0; i < table.getColumnCount(); i++) {
-			final int column = i;
-			table.getColumnModel().getColumn(i).addPropertyChangeListener(new PropertyChangeListener() {
+		Enumeration<TableColumn> columns = table.getColumnModel().getColumns();
+		while (columns.hasMoreElements()) {
+			TableColumn column = columns.nextElement();
+			column.addPropertyChangeListener(new PropertyChangeListener() {
 				@Override
 				public void propertyChange(PropertyChangeEvent evt) {
 					if (evt.getPropertyName().equals("width")) {
-						log.debug("Storing width of " + table.getName() + "-" + table.getColumnName(column) + ": " + table.getColumnModel().getColumn(column).getWidth());
+						log.debug("Storing width of " + table.getName() + "-" + column + ": " + column.getWidth());
 						((SwingPreferences) Application.getPreferences()).setTableColumnWidth(
-								key, column, table.getColumnModel().getColumn(column).getWidth());
+								key, column.getModelIndex(), column.getWidth());
 					}
 				}
 			});
 
 			final Integer width = ((SwingPreferences) Application.getPreferences()).getTableColumnWidth(
-					key, column);
+					key, column.getModelIndex());
 			if (width != null) {
-				table.getColumnModel().getColumn(column).setPreferredWidth(width);
+				column.setPreferredWidth(width);
 			}
 		}
 	}