diff --git a/modules/firefox-profile/functions/fhp b/modules/firefox-profile/functions/fhp
index 401fbeff..779e5a1e 100644
--- a/modules/firefox-profile/functions/fhp
+++ b/modules/firefox-profile/functions/fhp
@@ -11,6 +11,7 @@
 function die {
 	local ret=$?
 	print -P " %F{red}%1x: %F{yellow}%U%I%u:%f $argv" >&2
+	popd -q
 	return $ret
 }
 
@@ -28,7 +29,6 @@ if [[ -f $profile/.unpacked ]] {
 		mv -f $profile{,.old}$ext
 		if (( $? )) {
 			die "failed to override the old tarball"
-			popd -q
 			return
 		}
 	}
diff --git a/modules/firefox-profile/init.zsh b/modules/firefox-profile/init.zsh
index 07f3a7bd..2140c684 100644
--- a/modules/firefox-profile/init.zsh
+++ b/modules/firefox-profile/init.zsh
@@ -61,6 +61,7 @@ function {
 		pushd -q "$fhpdir:h" || return
 		tar -Ocp $profile | $=compressor $profile$ext
 		if (( $? )) {
+			popd -q
 			die "failed to pack a new tarball"
 			return
 		}