diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java
index f6c6d9a0b0..e309328f8c 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/ProgramManagerPlugin.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -635,6 +635,13 @@ public class ProgramManagerPlugin extends Plugin implements ProgramManager, Opti
 
 		OpenVersionedFileDialog<Program> openDialog =
 			new OpenVersionedFileDialog<>(tool, "Open Program", Program.class);
+
+		DomainFile startFile = null;
+		Program p = getCurrentProgram();
+		if (p != null) {
+			startFile = p.getDomainFile();
+		}
+		openDialog.selectDomainFile(startFile);
 		openDialog.setHelpLocation(new HelpLocation(HelpTopics.PROGRAM, "Open_File_Dialog"));
 
 		openDialog.addOkActionListener(e -> {