diff --git a/pkg/gui/controllers/helpers/working_tree_helper.go b/pkg/gui/controllers/helpers/working_tree_helper.go
index 482c31c0d..b5ea1b6bd 100644
--- a/pkg/gui/controllers/helpers/working_tree_helper.go
+++ b/pkg/gui/controllers/helpers/working_tree_helper.go
@@ -139,7 +139,13 @@ func (self *WorkingTreeHelper) HandleCommitEditorPress() error {
 }
 
 func (self *WorkingTreeHelper) HandleWIPCommitPress() error {
-	return self.HandleCommitPressWithMessage("", true)
+	var initialMessage string
+	preservedMessage := self.c.Contexts().CommitMessage.GetPreservedMessageAndLogError()
+	if preservedMessage == "" {
+		// Use the skipHook prefix only if we don't have a preserved message
+		initialMessage = self.c.UserConfig().Git.SkipHookPrefix
+	}
+	return self.HandleCommitPressWithMessage(initialMessage, true)
 }
 
 func (self *WorkingTreeHelper) HandleCommitPress() error {
diff --git a/pkg/integration/tests/commit/commit_wip_with_prefix.go b/pkg/integration/tests/commit/commit_wip_with_prefix.go
index 822a2b6ef..52ca52c23 100644
--- a/pkg/integration/tests/commit/commit_wip_with_prefix.go
+++ b/pkg/integration/tests/commit/commit_wip_with_prefix.go
@@ -32,7 +32,8 @@ var CommitWipWithPrefix = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.ExpectPopup().CommitMessagePanel().
 			Title(Equals("Commit summary")).
-			Type("foo").
+			InitialText(Equals("WIP")).
+			Type(" foo").
 			Cancel()
 
 		t.Views().Files().
@@ -41,7 +42,7 @@ var CommitWipWithPrefix = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.ExpectPopup().CommitMessagePanel().
 			Title(Equals("Commit summary")).
-			InitialText(Equals("foo")).
+			InitialText(Equals("WIP foo")).
 			Type(" bar").
 			Cancel()
 
@@ -51,11 +52,11 @@ var CommitWipWithPrefix = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.ExpectPopup().CommitMessagePanel().
 			Title(Equals("Commit summary")).
-			InitialText(Equals("foo bar")).
+			InitialText(Equals("WIP foo bar")).
 			Type(". Added something else").
 			Confirm()
 
 		t.Views().Commits().Focus()
-		t.Views().Main().Content(Contains("foo bar. Added something else"))
+		t.Views().Main().Content(Contains("WIP foo bar. Added something else"))
 	},
 })