diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java b/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java
index bdd3d7b..02bb69d 100644
--- a/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java
+++ b/src/com/webcodepro/applecommander/ui/swt/DiskWindow.java
@@ -61,7 +61,7 @@ public class DiskWindow {
 		shell = new Shell(parentShell, SWT.SHELL_TRIM);
 		shell.setLayout(new FillLayout());
 		shell.setImage(imageManager.getDiskIcon());
-		shell.setText("AppleCommander - " + disks[0].getFilename());
+		setStandardWindowTitle();
 		shell.addDisposeListener(new DisposeListener() {
 				public void widgetDisposed(DisposeEvent event) {
 					dispose(event);
@@ -70,7 +70,7 @@ public class DiskWindow {
 			
 		CTabFolder tabFolder = new CTabFolder(shell, SWT.BOTTOM);
 		diskExplorerTab = new DiskExplorerTab(tabFolder, disks, 
-			imageManager);
+			imageManager, this);
 		diskMapTabs = new DiskMapTab[disks.length];
 		for (int i=0; i<disks.length; i++) {
 			diskMapTabs[i] = new DiskMapTab(tabFolder, disks[i]);
@@ -82,6 +82,14 @@ public class DiskWindow {
 		shell.open();
 	}
 	
+	/**
+	 * Set the standard AppleCommander disk window title.
+	 * This is referenced in DiskWindow as well as DiskExplorerTab.
+	 */
+	public void setStandardWindowTitle() {
+		shell.setText("AppleCommander - " + disks[0].getFilename());
+	}
+	
 	/**
 	 * Dispose of all shared resources.
 	 */