diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java
index db8158ba05ba03df11aa7e20d082b4b6ba555005..99c559ec934807e8ce3bf5d4381e334e39aec8a2 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swing/components/ResultPanel.java
@@ -44,6 +44,7 @@ import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.LayoutStyle;
 import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
 
 import org.cytoscape.application.swing.CytoPanelComponent;
 import org.cytoscape.application.swing.CytoPanelName;
@@ -84,9 +85,6 @@ NetworkAboutToBeDestroyedListener
 
 	//MACRO
 
-	//TODO: (Nächstes Leben) find a good solution with Swing that scales the panel and respects layout
-	private static final int HACKFIX_FIXED_WIDTH = 128+256;
-
 	private final JTabbedPane tabbedPane;
 
 	private final JButton destroyButton;
@@ -183,7 +181,7 @@ NetworkAboutToBeDestroyedListener
 		horizontalGroup
 			.addComponent(marker,DEFAULT_SIZE,DEFAULT_SIZE,DEFAULT_SIZE)
 			.addComponent(invalidLabel,DEFAULT_SIZE, PREFERRED_SIZE,Short.MAX_VALUE)
-			.addComponent(tabbedPane,HACKFIX_FIXED_WIDTH, PREFERRED_SIZE,Short.MAX_VALUE)
+			.addComponent(tabbedPane,DEFAULT_SIZE, PREFERRED_SIZE,Short.MAX_VALUE)
 			.addComponent(destroyButton,DEFAULT_SIZE, DEFAULT_SIZE,DEFAULT_SIZE);
 		verticalGroup
 			.addComponent(marker,DEFAULT_SIZE,DEFAULT_SIZE,PREFERRED_SIZE)
@@ -195,9 +193,14 @@ NetworkAboutToBeDestroyedListener
 		layout.setAutoCreateGaps(true);
 		layout.setAutoCreateContainerGaps(true);
 
-		//SWING BLACK MAGIC FOR ADEPTS
-		this.setMinimumSize(new Dimension(HACKFIX_FIXED_WIDTH,this.getMinimumSize().height));
+		SwingUtilities.invokeLater(new Runnable() {
 
+			@Override
+			public void run() {
+				revalidate();
+			}
+
+		});
 		this.setLayout(layout);
 
 		registerAllListeners();