diff --git a/core/core-ui.el b/core/core-ui.el
index d5378b167..450ed1470 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -76,7 +76,7 @@ disabled.")
 
 (tooltip-mode -1) ; relegate tooltips to echo area only
 (menu-bar-mode -1)
-(when window-system
+(when (display-graphic-p)
   (scroll-bar-mode -1)
   (tool-bar-mode -1)
   ;; buffer name  in frame title