Index: lib/Padre/Wx/Main.pm
===================================================================
--- lib/Padre/Wx/Main.pm	(revision 5886)
+++ lib/Padre/Wx/Main.pm	(working copy)
@@ -2725,13 +2725,17 @@
 
 sub on_save_all {
 	my $self = shift;
+	my $currentID = $self->notebook->GetSelection;
 	foreach my $id ( $self->pageids ) {
 		my $editor = $self->notebook->GetPage($id) or next;
+		$editor->SetFocus;
 		my $doc = $editor->{Document};    # TODO no accessor for document?
 		if ( $doc->is_modified ) {
 			$self->on_save($doc) or return 0;
 		}
 	}
+	# set focus back to the currentDocument
+	$self->notebook->SetSelection($currentID);
 	return 1;
 }