diff --git a/src/Commands/Submodule.cs b/src/Commands/Submodule.cs
index 428c10d1..3c4460ea 100644
--- a/src/Commands/Submodule.cs
+++ b/src/Commands/Submodule.cs
@@ -29,9 +29,10 @@ namespace SourceGit.Commands
             }
         }
 
-        public bool Update()
+        public bool Update(Action<string> outputHandler)
         {
             Args = $"submodule update --rebase --remote";
+            _outputHandler = outputHandler;
             return Exec();
         }
 
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index b5a96ecd..ad919346 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -458,6 +458,8 @@
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Delete${0}$</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push${0}$</x:String>
   <x:String x:Key="Text.URL" xml:space="preserve">URL :</x:String>
+  <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Update Submodules</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Tip" xml:space="preserve">Run `submodule update` command for this repository.</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">Warning</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Create Group</x:String>
   <x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">Create Sub-Group</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index f1c5a95f..ba330800 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -461,6 +461,8 @@
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">删除${0}$</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">推送${0}$</x:String>
   <x:String x:Key="Text.URL" xml:space="preserve">仓库地址 ：</x:String>
+  <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">更新子模块</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Tip" xml:space="preserve">为此仓库执行`submodule update`命令，更新所有的子模块。</x:String>
   <x:String x:Key="Text.Warn" xml:space="preserve">警告</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">新建分组</x:String>
   <x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">新建子分组</x:String>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index cef2dddc..65ee45f2 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -769,6 +769,12 @@ namespace SourceGit.ViewModels
                 PopupHost.ShowPopup(new AddSubmodule(this));
         }
 
+        public void UpdateSubmodules()
+        {
+            if (PopupHost.CanCreatePopup())
+                PopupHost.ShowAndStartPopup(new UpdateSubmodules(this));
+        }
+
         public ContextMenu CreateContextMenuForGitFlow()
         {
             var menu = new ContextMenu();
diff --git a/src/ViewModels/UpdateSubmodules.cs b/src/ViewModels/UpdateSubmodules.cs
new file mode 100644
index 00000000..56064317
--- /dev/null
+++ b/src/ViewModels/UpdateSubmodules.cs
@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+
+namespace SourceGit.ViewModels
+{
+    public class UpdateSubmodules : Popup
+    {
+        public UpdateSubmodules(Repository repo)
+        {
+            _repo = repo;
+            View = new Views.UpdateSubmodules() { DataContext = this };
+        }
+
+        public override Task<bool> Sure()
+        {
+            _repo.SetWatcherEnabled(false);
+            ProgressDescription = "Updating submodules ...";
+
+            return Task.Run(() =>
+            {
+                new Commands.Submodule(_repo.FullPath).Update(SetProgressDescription);
+                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                return true;
+            });
+        }
+
+        private readonly Repository _repo = null;
+    }
+}
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 97aa01f3..1eadb7ac 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -306,16 +306,10 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
-        private async void UpdateSubmodules(object sender, RoutedEventArgs e)
+        private void UpdateSubmodules(object sender, RoutedEventArgs e)
         {
             if (DataContext is ViewModels.Repository repo)
-            {
-                repo.SetWatcherEnabled(false);
-                iconSubmoduleUpdate.Classes.Add("rotating");
-                await Task.Run(() => new Commands.Submodule(repo.FullPath).Update());
-                iconSubmoduleUpdate.Classes.Remove("rotating");
-                repo.SetWatcherEnabled(true);
-            }
+                repo.UpdateSubmodules();
 
             e.Handled = true;
         }
diff --git a/src/Views/UpdateSubmodules.axaml b/src/Views/UpdateSubmodules.axaml
new file mode 100644
index 00000000..5ea93fac
--- /dev/null
+++ b/src/Views/UpdateSubmodules.axaml
@@ -0,0 +1,17 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:vm="using:SourceGit.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.UpdateSubmodules"
+             x:DataType="vm:UpdateSubmodules">
+  <StackPanel Orientation="Vertical" Margin="8,0">
+    <TextBlock FontSize="18"
+               Classes="bold"
+               Text="{DynamicResource Text.UpdateSubmodules}"/>
+    <TextBlock Text="{DynamicResource Text.UpdateSubmodules.Tip}"
+               Margin="0,16,0,0"
+               HorizontalAlignment="Center"/>
+  </StackPanel>
+</UserControl>
diff --git a/src/Views/UpdateSubmodules.axaml.cs b/src/Views/UpdateSubmodules.axaml.cs
new file mode 100644
index 00000000..165c809a
--- /dev/null
+++ b/src/Views/UpdateSubmodules.axaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public partial class UpdateSubmodules : UserControl
+    {
+        public UpdateSubmodules()
+        {
+            InitializeComponent();
+        }
+    }
+}