diff --git a/early-init.el b/early-init.el
index e505ed13..1caaa94a 100644
--- a/early-init.el
+++ b/early-init.el
@@ -377,8 +377,6 @@ startup phase.")
 (defvar my-frame-title-format "%b – Emacs"
   "Template for displaying the title bar of visible and iconified frame.")
 
-;; `display-graphic-p' not working during early-init
-
 (setq frame-title-format my-frame-title-format)
 (setq icon-title-format my-frame-title-format)
 
@@ -437,42 +435,43 @@ startup phase.")
 (add-to-list 'initial-frame-alist '(background-color . "#1e1e1e"))
 (add-to-list 'initial-frame-alist '(foreground-color . "#b2b2b2"))
 
-;; Custom functions/hooks for persisting/loading frame geometry upon save/load
-(defvar my-frame-geometry-file (concat user-cache-directory "frame-geometry.el"))
-(defun my-frame-geometry-save ()
-  "Gets the current frame's geometry and save it to `my-frame-geometry-file'."
-  (let (;; (frameg-font (frame-parameter (selected-frame) 'font))
-        (frameg-top (frame-parameter (selected-frame) 'top))
-        (frameg-left (frame-parameter (selected-frame) 'left))
-        (frameg-width (frame-parameter (selected-frame) 'width))
-        (frameg-height (frame-parameter (selected-frame) 'height))
-        ;; (frameg-alpha (frame-parameter (selected-frame) 'alpha))
-        (frameg-file my-frame-geometry-file))
-    (with-temp-buffer
-      ;; Turn off backup for this file
-      (make-local-variable 'make-backup-files)
-      (setq make-backup-files nil)
-      (when (featurep 'scroll-bar)  ;; for terminal scroll-bar ist not loaded
-        (scroll-bar-mode -1))
-      (insert
-       ";;; " (file-name-nondirectory frameg-file) " --- Frame configuration  -*- no-byte-compile: t; lexical-binding: t; -*-"
-       ";;; This file stores the previous emacs frame's geometry.\n"
-       ";;; Last generated " (current-time-string) ".\n"
-       (format "(add-to-list 'initial-frame-alist '(top . %d))\n" (max frameg-top 0))
-       (format "(add-to-list 'initial-frame-alist '(left . %d))\n" (max frameg-left 0))
-       (format "(add-to-list 'initial-frame-alist '(width . %d))\n" (max frameg-width 0))
-       (format "(add-to-list 'initial-frame-alist '(height . %d))\n" (max frameg-height 0))
-       )
-      (when (file-writable-p frameg-file)
-        (write-file frameg-file)))))
-(defun my-frame-geometry-load ()
-  "Load `my-frame-geometry-file' which should load the previous frame's geometry."
-  (let ((frameg-file my-frame-geometry-file))
-    (when (file-readable-p frameg-file)
-      ;; (load-file frameg-file)
-      (load (expand-file-name frameg-file) nil (not my-debug) t))))
-(my-frame-geometry-load)
-(add-hook 'kill-emacs-hook 'my-frame-geometry-save)
+(when (display-graphic-p)
+  ;; Custom functions/hooks for persisting/loading frame geometry upon save/load
+  (defvar my-frame-geometry-file (concat user-cache-directory "frame-geometry.el"))
+  (defun my-frame-geometry-save ()
+    "Gets the current frame's geometry and save it to `my-frame-geometry-file'."
+    (let (;; (frameg-font (frame-parameter (selected-frame) 'font))
+          (frameg-top (frame-parameter (selected-frame) 'top))
+          (frameg-left (frame-parameter (selected-frame) 'left))
+          (frameg-width (frame-parameter (selected-frame) 'width))
+          (frameg-height (frame-parameter (selected-frame) 'height))
+          ;; (frameg-alpha (frame-parameter (selected-frame) 'alpha))
+          (frameg-file my-frame-geometry-file))
+      (with-temp-buffer
+        ;; Turn off backup for this file
+        (make-local-variable 'make-backup-files)
+        (setq make-backup-files nil)
+        (when (featurep 'scroll-bar)  ;; for terminal scroll-bar is not loaded
+          (scroll-bar-mode -1))
+        (insert
+         ";;; " (file-name-nondirectory frameg-file) " --- Frame configuration  -*- no-byte-compile: t; lexical-binding: t; -*-"
+         ";;; This file stores the previous emacs frame's geometry.\n"
+         ";;; Last generated " (current-time-string) ".\n"
+         (format "(add-to-list 'initial-frame-alist '(top . %d))\n" (max frameg-top 0))
+         (format "(add-to-list 'initial-frame-alist '(left . %d))\n" (max frameg-left 0))
+         (format "(add-to-list 'initial-frame-alist '(width . %d))\n" (max frameg-width 0))
+         (format "(add-to-list 'initial-frame-alist '(height . %d))\n" (max frameg-height 0))
+         )
+        (when (file-writable-p frameg-file)
+          (write-file frameg-file)))))
+  (defun my-frame-geometry-load ()
+    "Load `my-frame-geometry-file' which should load the previous frame's geometry."
+    (let ((frameg-file my-frame-geometry-file))
+      (when (file-readable-p frameg-file)
+        ;; (load-file frameg-file)
+        (load (expand-file-name frameg-file) nil (not my-debug) t))))
+  (my-frame-geometry-load)
+  (add-hook 'kill-emacs-hook 'my-frame-geometry-save))
 
 
 ;;; Security