diff --git a/src/main/webapp/xnat-templates/screens/JS_Return_Autoclose.vm b/src/main/webapp/xnat-templates/screens/JS_Return_Autoclose.vm
new file mode 100644
index 0000000000000000000000000000000000000000..a3d3dc1b180738e15152fd981c6d32b3247642a0
--- /dev/null
+++ b/src/main/webapp/xnat-templates/screens/JS_Return_Autoclose.vm
@@ -0,0 +1,7 @@
+#set ($template = $data.getTemplateInfo())
+$!template.setLayoutTemplate("ScreenOnly.vm")
+<!-- only useful for popups. -->
+<script>
+    window.opener.location.reload();
+    window.close();
+</script>
diff --git a/src/main/webapp/xnat-templates/screens/XDATScreen_edit_xnat_investigatorData.vm b/src/main/webapp/xnat-templates/screens/XDATScreen_edit_xnat_investigatorData.vm
index 7f1ae0aa78d198379a985d930fa5541b3895df69..50021e2b35bd1db19d7488eadb47e71cec331d62 100644
--- a/src/main/webapp/xnat-templates/screens/XDATScreen_edit_xnat_investigatorData.vm
+++ b/src/main/webapp/xnat-templates/screens/XDATScreen_edit_xnat_investigatorData.vm
@@ -59,7 +59,7 @@ $page.setVlinkColor($ui.vlink)
 		</TD>
 	</TR>
 	#xdatEditProps($item $edit_screen)
-	<input type="hidden" name="destination" value="$!destination"/>
+	<input type="hidden" name="destination" value="JS_Return_Autoclose.vm"/>
 	<TR><TD COLSPAN=2 ALIGN=center><input type="submit" name="eventSubmit_doSetup" value="Submit"/></TD></TR>
 </table>
 
@@ -67,4 +67,4 @@ $page.setVlinkColor($ui.vlink)
 			#hideFormJustification()
 
 </form>
-</p>
\ No newline at end of file
+</p>