1 files changed, 5 insertions, 0 deletions

diff --git a/src/cuchaz/enigma/gui/Gui.java b/src/cuchaz/enigma/gui/Gui.java
index a5471a7..cd0fac7 100644
--- a/src/cuchaz/enigma/gui/Gui.java
+++ b/src/cuchaz/enigma/gui/Gui.java
@@ -479,6 +479,7 @@ public class Gui
                         }
                 } );
                 m_tokens.setPreferredSize( new Dimension( 0, 200 ) );
+                m_tokens.setMinimumSize( new Dimension( 0, 200 ) );
                 JSplitPane callPanel = new JSplitPane( JSplitPane.VERTICAL_SPLIT, true, new JScrollPane( m_callsTree ), new JScrollPane( m_tokens ) );
                 callPanel.setResizeWeight( 1 ); // let the top side take all the slack
                 callPanel.resetToPreferredSizes();
@@ -775,6 +776,10 @@ public class Gui
                         m_tokens.setListData( sortedTokens );
                         m_tokens.setSelectedIndex( 0 );
                 }
+                else
+                {
+                        m_tokens.setListData( new Vector<Token>() );
+                }
                 
                 // show the first token
                 showToken( sortedTokens.get( 0 ) );