diff --git a/src/net/azib/ipscan/config/ComponentRegistry.java b/src/net/azib/ipscan/config/ComponentRegistry.java
index 50e297a7..e14bdf3a 100644
--- a/src/net/azib/ipscan/config/ComponentRegistry.java
+++ b/src/net/azib/ipscan/config/ComponentRegistry.java
@@ -14,7 +14,6 @@ import net.azib.ipscan.exporters.*;
 import net.azib.ipscan.fetchers.*;
 import net.azib.ipscan.gui.*;
 import net.azib.ipscan.gui.MainMenu.CommandsMenu;
-import net.azib.ipscan.gui.MainWindow.FeederSelectionCombo;
 import net.azib.ipscan.gui.actions.*;
 import net.azib.ipscan.gui.feeders.FeederGUIRegistry;
 import net.azib.ipscan.gui.feeders.FileFeederGUI;
@@ -101,8 +100,8 @@ public class ComponentRegistry {
 				new ComponentParameter("mainShell"), new ConstantParameter(SWT.NONE) });
 		container.registerComponentImplementation("startStopButton", Button.class, new Parameter[] {
 				new ComponentParameter("controlsArea"), new ConstantParameter(SWT.NONE) });
-		container.registerComponentImplementation("feederSelectionCombo", FeederSelectionCombo.class,
-				new Parameter[] { new ComponentParameter("controlsArea") });
+		container.registerComponentImplementation("feederSelectionCombo", Combo.class,
+				new Parameter[] { new ComponentParameter("controlsArea"), new ConstantParameter(SWT.READ_ONLY) });
 
 		// GUI Feeders
 		container.registerComponentImplementation(FeederGUIRegistry.class);
diff --git a/src/net/azib/ipscan/gui/MainWindow.java b/src/net/azib/ipscan/gui/MainWindow.java
index 6d8d3359..ba31e490 100644
--- a/src/net/azib/ipscan/gui/MainWindow.java
+++ b/src/net/azib/ipscan/gui/MainWindow.java
@@ -251,23 +251,4 @@ public class MainWindow {
 			statusBar.setEnabled(enabled);
 		}
 	}
-	
-	// TODO: remove this class with SWT > 3.5
-	public static class FeederSelectionCombo extends Combo {
-		public FeederSelectionCombo(Composite parent) {
-			super(parent, SWT.READ_ONLY);
-		}
-
-		@Override
-		public int getTextHeight() {
-			// fixes the problem described here: https://bugs.eclipse.org/bugs/show_bug.cgi?id=223015			
-			return buttonHeight;
-		}
-
-		@Override
-		protected void checkSubclass() {
-			// allow subclassing
-		}
-	}
-
 }