diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index 97684093..35db11b9 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -440,6 +440,8 @@ namespace SourceGit.ViewModels
 
         public void ContinueMerge()
         {
+            IsCommitting = true;
+
             if (_inProgressContext != null)
             {
                 _repo.SetWatcherEnabled(false);
@@ -456,17 +458,21 @@ namespace SourceGit.ViewModels
                             CommitMessage = string.Empty;
 
                         _repo.SetWatcherEnabled(true);
+                        IsCommitting = false;
                     });
                 });
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
+                IsCommitting = false;
             }
         }
 
         public void SkipMerge()
         {
+            IsCommitting = true;
+
             if (_inProgressContext != null)
             {
                 _repo.SetWatcherEnabled(false);
@@ -479,17 +485,21 @@ namespace SourceGit.ViewModels
                             CommitMessage = string.Empty;
 
                         _repo.SetWatcherEnabled(true);
+                        IsCommitting = false;
                     });
                 });
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
+                IsCommitting = false;
             }
         }
 
         public void AbortMerge()
         {
+            IsCommitting = true;
+
             if (_inProgressContext != null)
             {
                 _repo.SetWatcherEnabled(false);
@@ -502,12 +512,14 @@ namespace SourceGit.ViewModels
                             CommitMessage = string.Empty;
 
                         _repo.SetWatcherEnabled(true);
+                        IsCommitting = false;
                     });
                 });
             }
             else
             {
                 _repo.MarkWorkingCopyDirtyManually();
+                IsCommitting = false;
             }
         }
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index ebf26a96..0120eda5 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -397,7 +397,8 @@
                 Width="0" Height="0"
                 Background="Transparent"
                 Command="{Binding CommitWithAutoStage}"
-                HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"/>
+                HotKey="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+Shift+Enter}"
+                IsEnabled="{Binding !IsCommitting}"/>
 
         <Button Grid.Column="8"
                 Classes="flat"