diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto
index 6736293..43877e2 100755
--- a/arch-graphical-install-auto
+++ b/arch-graphical-install-auto
@@ -257,11 +257,6 @@ if [ -d /root/.config ]; then
     rm -Rv /root/.config
 fi
 
-# shell-fish
-
-chsh -s /usr/bin/fish root
-chsh -s /usr/bin/fish ${username}
-
 # mirrorlist
 cp /opt/${repo}/mirrorlist_libre /etc/pacman.d/mirrorlist_libre
 cp /opt/${repo}/mirrorlist /etc/pacman.d/mirrorlist
@@ -535,6 +530,7 @@ if [ "${vollinstallation}" != "n" ]; then
     cp /opt/${repo}/.bashrc /root/
 
     # config.fish
+    mkdir -p /root/.config/fish/
     cp /opt/${repo}/config.fish /root/.config/fish/config.fish
 
     # btrfs-swapfile
@@ -599,6 +595,11 @@ if [ "${vollinstallation}" != "n" ]; then
     cp /opt/${repo}/adduser.sh /usr/bin/adduser
     chmod 755 /usr/bin/adduser
 
+    # shell-fish
+
+    chsh -s /usr/bin/fish root
+    chsh -s /usr/bin/fish ${username}
+
 fi
 
 
diff --git a/base.txt b/base.txt
index d82904d..1f48810 100755
--- a/base.txt
+++ b/base.txt
@@ -8,6 +8,7 @@ dialog
 dosfstools
 efibootmgr
 efitools
+fish
 gdisk
 git
 grub