diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 101ffc0..4e924c8 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -231,8 +231,6 @@
    locale-coding-system 'utf-8
    next-line-add-newlines nil
    sentence-end-double-space nil
-   tab-bar-new-tab-choice "*scratch*"
-   tab-bar-show nil
    user-full-name "Tobias Ostner"
    user-mail-address "tobias.ostner@gmail.com"
    undo-limit 6710886400 ;; 64mb
@@ -619,9 +617,21 @@
 
 (use-package system-packages)
 
+(use-package tab-bar
+  :ensure nil
+  :config
+  (tab-bar-mode)
+  (setq tab-bar-show t
+        tab-bar-close-button-show nil
+        tab-bar-new-tab-choice "*scratch*"
+        tab-bar-new-button-show nil)
+  (set-face-attribute
+   'tab-bar nil
+   :height 1.0))
+
 (use-package tabspaces
   :config
-  (tabspaces-mode)
+  (tabspaces-mode 1)
   :custom
   (tabspaces-use-filtered-buffers-as-default t))