diff --git a/browser/native_window.h b/browser/native_window.h
index 8fb0f118fd..3316b07053 100644
--- a/browser/native_window.h
+++ b/browser/native_window.h
@@ -115,6 +115,8 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
     observers_.RemoveObserver(obs);
   }
 
+  bool has_frame() const { return has_frame_; }
+
  protected:
   explicit NativeWindow(content::WebContents* web_contents,
                         base::DictionaryValue* options);
diff --git a/browser/native_window_mac.mm b/browser/native_window_mac.mm
index d6858a191b..4994fad65f 100644
--- a/browser/native_window_mac.mm
+++ b/browser/native_window_mac.mm
@@ -67,6 +67,13 @@
   return NO;
 }
 
+- (void)windowDidExitFullScreen:(NSNotification*)notification {
+  if (!shell_->has_frame()) {
+    NSWindow* window = shell_->GetNativeWindow();
+    [[window standardWindowButton:NSWindowFullScreenButton] setHidden:YES];
+  }
+}
+
 @end
 
 @interface AtomNSWindow : AtomEventProcessingWindow {