diff --git a/infinity/gui/ViewFrame.java b/infinity/gui/ViewFrame.java
index 531aa91..30856e2 100644
--- a/infinity/gui/ViewFrame.java
+++ b/infinity/gui/ViewFrame.java
@@ -73,6 +73,9 @@ protected void windowClosing() throws Exception
   {
     if (viewable instanceof Closeable)
       ((Closeable)viewable).close();
+
+    this.viewable = null;
+    this.getContentPane().removeAll();
   }
 }