diff --git a/src/org/infinity/gui/ViewFrame.java b/src/org/infinity/gui/ViewFrame.java
index 54d441593..ba920d679 100644
--- a/src/org/infinity/gui/ViewFrame.java
+++ b/src/org/infinity/gui/ViewFrame.java
@@ -81,7 +81,7 @@ public void setViewable(Viewable viewable) {
     this.viewable = viewable;
     if (viewable instanceof Resource && ((Resource) viewable).getResourceEntry() != null) {
       ResourceEntry entry = ((Resource) viewable).getResourceEntry();
-      // setTitle(entry.toString());
+      setTitle(getViewableTitle(viewable));
       setIconImage(entry.getIcon().getImage());
       final String path;
       if (entry instanceof BIFFResourceEntry) {
diff --git a/src/org/infinity/resource/dlg/Viewer.java b/src/org/infinity/resource/dlg/Viewer.java
index 355a24276..b64bc19fd 100644
--- a/src/org/infinity/resource/dlg/Viewer.java
+++ b/src/org/infinity/resource/dlg/Viewer.java
@@ -573,7 +573,6 @@ private void updateViewerLists() {
   }
 
   private void showExternState(DlgResource newdlg, int state, boolean isUndo) {
-
     alive = false;
     Container window = getTopLevelAncestor();
     if (window instanceof ViewFrame && window.isVisible()) {