diff --git a/scripts/helpers.sh b/scripts/helpers.sh
index 1cb9fd1..59a9d1c 100644
--- a/scripts/helpers.sh
+++ b/scripts/helpers.sh
@@ -73,3 +73,10 @@ resurrect_history_file() {
 	local pane_id="$1"
 	echo "$(resurrect_dir)/bash_history-${pane_id}"
 }
+
+restore_zoomed_windows() {
+	awk 'BEGIN { FS="\t"; OFS="\t" } /^pane/ && $6 ~ /Z/ && $9 == 1 { print $2, $3; }' $(last_resurrect_file) |
+		while IFS=$'\t' read session_name window_number; do
+			tmux resize-pane -t "${session_name}:${window_number}" -Z
+		done
+}
diff --git a/scripts/restore.sh b/scripts/restore.sh
index 6dd1707..8ef24f2 100755
--- a/scripts/restore.sh
+++ b/scripts/restore.sh
@@ -183,13 +183,6 @@ restore_active_pane_for_each_window() {
 		done
 }
 
-restore_zoomed_windows() {
-	awk 'BEGIN { FS="\t"; OFS="\t" } /^window/ && $5 ~ /Z/ { print $2, $3; }' $(last_resurrect_file) |
-		while IFS=$'\t' read session_name window_number; do
-			tmux resize-pane -t "${session_name}:${window_number}" -Z
-		done
-}
-
 restore_active_and_alternate_windows() {
 	awk 'BEGIN { FS="\t"; OFS="\t" } /^window/ && $5 ~ /[*-]/ { print $2, $4, $3; }' $(last_resurrect_file) |
 		sort -u |
diff --git a/scripts/save.sh b/scripts/save.sh
index 07e3d29..612d7a0 100755
--- a/scripts/save.sh
+++ b/scripts/save.sh
@@ -100,8 +100,16 @@ save_shell_history() {
 dump_panes() {
 	local full_command
 	local d=$'\t' # delimiter
+	local last_resized="none-resized"
 	dump_panes_raw |
 		while IFS=$'\t' read line_type session_name window_number window_name window_active window_flags pane_index dir pane_active pane_command pane_pid; do
+			# check if current pane is part of a maximized window and if we haven't maximized it already
+			if [[ "${window_flags}" == *Z* ]] && [[ "${last_resized}" != ${window_number} ]]; then
+				# unmaximize the pane
+				tmux resize-pane -Z -t "${session_name}:${window_number}"
+				# set last resized window to current number in order to avoid maximizing again
+				last_resized=${window_number}
+			fi
 			full_command="$(pane_full_command $pane_pid)"
 			echo "${line_type}${d}${session_name}${d}${window_number}${d}${window_name}${d}${window_active}${d}${window_flags}${d}${pane_index}${d}${dir}${d}${pane_active}${d}${pane_command}${d}:${full_command}"
 		done
@@ -132,6 +140,7 @@ save_all() {
 	if save_bash_history_option_on; then
 		dump_bash_history
 	fi
+	restore_zoomed_windows
 }
 
 main() {