diff --git a/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java b/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java
index 85fd191..0ad7920 100644
--- a/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java
+++ b/se/sics/mspsim/extutil/highlight/HighlightSourceViewer.java
@@ -50,6 +50,7 @@ import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 
 import se.sics.mspsim.util.SourceViewer;
+import se.sics.mspsim.util.WindowUtils;
 
 /**
  *
@@ -75,7 +76,8 @@ public class HighlightSourceViewer implements SourceViewer {
       scroller.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
       Container pane = window.getContentPane();
       pane.add(scroller);
-      window.pack();
+      WindowUtils.restoreWindowBounds("SourceViewer", window);
+      WindowUtils.addSaveOnShutdown("SourceViewer", window);
     }
   }