diff --git a/CHANGELOG.md b/CHANGELOG.md
index bccbb7d..26a69a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - make archive & compress pane contents process more portable
 - `mutt` added to the list of automatically restored programs
 - added guide for migrating from tmuxinator
+- symlink `last` file only after successful save
 
 ### v2.4.0, 2015-02-23
 - add "tmux-test"
diff --git a/scripts/save.sh b/scripts/save.sh
index d861ba5..fa6fdef 100755
--- a/scripts/save.sh
+++ b/scripts/save.sh
@@ -259,7 +259,6 @@ save_all() {
 	dump_panes   >> "$resurrect_file_path"
 	dump_windows >> "$resurrect_file_path"
 	dump_state   >> "$resurrect_file_path"
-	ln -fs "$(basename "$resurrect_file_path")" "$(last_resurrect_file)"
 	if capture_pane_contents_option_on; then
 		mkdir -p "$(pane_contents_dir)"
 		dump_pane_contents
@@ -269,6 +268,7 @@ save_all() {
 	if save_bash_history_option_on; then
 		dump_bash_history
 	fi
+	ln -fs "$(basename "$resurrect_file_path")" "$(last_resurrect_file)"
 }
 
 show_output() {