Index: /trunk/lib/MT/App/CMS.pm
===================================================================
--- /trunk/lib/MT/App/CMS.pm (revision 5)
+++ /trunk/lib/MT/App/CMS.pm (revision 12)
@@ -2968,4 +2968,5 @@
         }
         $param{show_feedback} = $param{show_allow_pings} || $param{show_allow_comments};
+        $param{refocus} = 1;
         return $app->build_page("bm_entry.tmpl", \%param);
     } elsif ($param{output}) {
@@ -7501,4 +7502,5 @@
     $app->run_callbacks('RebuildOptions', $app, \@options);
     $param{rebuild_option_loop} = \@options;
+    $param{refocus} = 1;
     $app->add_breadcrumb($app->translate('Rebuild Site'));
     $app->build_page('rebuild_confirm.tmpl', \%param);
@@ -8211,4 +8213,5 @@
     push @extra_paths, { path => $date_stamp, label => '<' . $app->translate($label_path) . '>' . '/' . $date_stamp };
     $param{extra_paths} = \@extra_paths;
+    $param{refocus} = 1;
     $app->build_page('upload.tmpl', \%param);
 }
Index: /trunk/tmpl/cms/header-popup.tmpl
===================================================================
--- /trunk/tmpl/cms/header-popup.tmpl (revision 2)
+++ /trunk/tmpl/cms/header-popup.tmpl (revision 12)
@@ -19,5 +19,5 @@
 </head>
 
-<body id="mode_<TMPL_VAR NAME=MODE>" class="<TMPL_IF NAME=BLOG_ID>blog blog-<TMPL_VAR NAME=BLOG_ID><TMPL_ELSE>system</TMPL_IF>" onload="window.focus()">
+<body id="mode_<TMPL_VAR NAME=MODE>" class="<TMPL_IF NAME=BLOG_ID>blog blog-<TMPL_VAR NAME=BLOG_ID><TMPL_ELSE>system</TMPL_IF>"<TMPL_IF NAME=REFOCUS> onload="window.focus()</TMPL_IF>">
 
 <div id="topnav-img"><h1><img alt="Movable Type" src="<TMPL_VAR NAME=STATIC_URI>images/topnav-logo-popup.gif" width="204" height="66" border="0" /></h1></div>
