1 files changed, 2 insertions, 1 deletions

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index e67fb70eede..0b0e694020b 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -227,7 +227,8 @@ turn off menu bars; otherwise, turn on menu bars."
       (setq frames (cdr frames)))))
 
 ;; Make frames created from now on have a menu bar.
-(menu-bar-mode t)
+(if window-system
+    (menu-bar-mode t))
 
 (provide 'menu-bar)