diff --git a/.chezmoiscripts/run_once_after_change-shell-to-fish.sh b/.chezmoiscripts/run_once_after_change-shell-to-fish.sh
new file mode 100644
index 0000000..7d21392
--- /dev/null
+++ b/.chezmoiscripts/run_once_after_change-shell-to-fish.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [ "$SHELL" != "$(which fish)" ]; then
+	chsh -s "$(which fish)"
+fi