diff --git a/src/nsterm.m b/src/nsterm.m
index 575b24754e7..d25f216edd4 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1407,7 +1407,7 @@ -(void)remove
   block_input ();
   if (FRAME_VISIBLE_P (f))
     {
-      if (make_key)
+      if (make_key && !f->no_accept_focus)
         [[view window] makeKeyAndOrderFront: NSApp];
       else
         [[view window] orderFront: NSApp];