diff --git a/src/ViewModels/Rebase.cs b/src/ViewModels/Rebase.cs
index ece92013..de91459e 100644
--- a/src/ViewModels/Rebase.cs
+++ b/src/ViewModels/Rebase.cs
@@ -51,8 +51,19 @@ namespace SourceGit.ViewModels
             return Task.Run(() =>
             {
                 new Commands.Rebase(_repo.FullPath, _revision, AutoStash).Use(log).Exec();
+
                 log.Complete();
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() =>
+                {
+                    _repo.RefreshWorkingCopyChanges();
+
+                    if (_repo.HasUnresolvedConflicts)
+                    {
+                        _repo.SelectedViewIndex = 1;
+                    }
+
+                    _repo.SetWatcherEnabled(true);
+                });
                 return true;
             });
         }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 289d890f..74fdb960 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -398,6 +398,11 @@ namespace SourceGit.ViewModels
             get => _workingCopy?.InProgressContext;
         }
 
+        public bool HasUnresolvedConflicts
+        {
+            get => _workingCopy?.HasUnsolvedConflicts ?? false;
+        }
+
         public Models.BisectState BisectState
         {
             get => _bisectState;