diff --git a/src/nsterm.m b/src/nsterm.m
index dabc36ce018..205b1621399 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -9361,7 +9361,10 @@ - (instancetype) initWithEmacsFrame: (struct frame *) f
 
 - (void)createToolbar: (struct frame *)f
 {
-  if (FRAME_UNDECORATED (f) || !FRAME_EXTERNAL_TOOL_BAR (f) || [self toolbar] != nil)
+  if (FRAME_UNDECORATED (f)
+      || [self styleMask] == NSWindowStyleMaskBorderless
+      || !FRAME_EXTERNAL_TOOL_BAR (f)
+      || [self toolbar] != nil)
     return;
 
   EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f);