diff --git a/system_files/desktop/shared/usr/share/fish/functions/fish_greeting.fish b/system_files/desktop/shared/usr/share/fish/functions/fish_greeting.fish
new file mode 100644
index 00000000..35b39dd6
--- /dev/null
+++ b/system_files/desktop/shared/usr/share/fish/functions/fish_greeting.fish
@@ -0,0 +1,13 @@
+function fish_greeting
+	if test -d "$HOME"
+		if test ! -e "$HOME"/.config/no-show-user-motd
+			if test -x "/usr/libexec/ublue-motd"
+				/usr/libexec/ublue-motd
+			end
+		end
+	end
+
+	if set -q fish_private_mode
+		echo "fish is running in private mode, history will not be persisted."
+	end
+end