diff --git a/include/views/cef_window_delegate.h b/include/views/cef_window_delegate.h
index e9a1b528c..90bc7dfb5 100644
--- a/include/views/cef_window_delegate.h
+++ b/include/views/cef_window_delegate.h
@@ -134,7 +134,7 @@ class CefWindowDelegate : public CefPanelDelegate {
   ///
   /*--cef()--*/
   virtual bool WithStandardWindowButtons(CefRefPtr<CefWindow> window) {
-    return false;
+    return !IsFrameless(window);
   }
 
   ///