diff --git a/lisp/mitch-packages.el b/lisp/mitch-packages.el
index 49660e2..5f17ae9 100644
--- a/lisp/mitch-packages.el
+++ b/lisp/mitch-packages.el
@@ -263,6 +263,8 @@
   :config (edwina-mode)
   (advice-add 'balance-windows
 	      :override 'edwina-arrange)
+  (add-hook 'server-after-make-frame-hook #'edwina-arrange)
+  (edwina-arrange)
   :general
   (general-define-key
    [remap split-window-right] 'edwina-clone-window