diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
index 1f74a49a2..d08087ac2 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Languages/en.xaml
@@ -8,7 +8,9 @@
     <system:String x:Key="plugin_pluginsmanager_download_success">Successfully downloaded {0}</system:String>
     <system:String x:Key="plugin_pluginsmanager_download_error">Error: Unable to download the plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_uninstall_prompt">{0} by {1} {2}{3}Would you like to uninstall this plugin? After the uninstallation Flow will automatically restart.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_uninstall_prompt_no_restart">{0} by {1} {2}{2}Would you like to uninstall this plugin?</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_prompt">{0} by {1} {2}{3}Would you like to install this plugin? After the installation Flow will automatically restart.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_install_prompt_no_restart">{0} by {1} {2}{2}Would you like to install this plugin?</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_title">Plugin Install</system:String>
     <system:String x:Key="plugin_pluginsmanager_installing_plugin">Installing Plugin</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_from_web">Download and install {0}</system:String>
@@ -21,15 +23,19 @@
     <system:String x:Key="plugin_pluginsmanager_update_noresult_title">No update available</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_noresult_subtitle">All plugins are up to date</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_prompt">{0} by {1} {2}{3}Would you like to update this plugin? After the update Flow will automatically restart.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_update_prompt_no_restart">{0} by {1} {2}{2}Would you like to update this plugin?</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_title">Plugin Update</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_exists">This plugin has an update, would you like to see it?</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_alreadyexists">This plugin is already installed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_title">Plugin Manifest Download Failed</system:String>
     <system:String x:Key="plugin_pluginsmanager_update_failed_subtitle">Please check if you can connect to github.com. This error means you may not be able to install or update plugins.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_update_success_restart">Plugin {0} successfully updated. Restarting Flow, please wait...</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning_title">Installing from an unknown source</system:String>
     <system:String x:Key="plugin_pluginsmanager_install_unknown_source_warning">You are installing this plugin from an unknown source and it may contain potential risks!{0}{0}Please ensure you understand where this plugin is from and that it is safe.{0}{0}Would you like to continue still?{0}{0}(You can switch off this warning via settings)</system:String>
-
-    <!--  Controls  -->
+    
+    <system:String x:Key="plugin_pluginsmanager_install_success_no_restart">Plugin {0} successfully installed. Please manually restart Flow.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_uninstall_success_no_restart">Plugin {0} successfully uninstalled. Please manually restart Flow.</system:String>
+    <system:String x:Key="plugin_pluginsmanager_update_success_no_restart">Plugin {0} successfully updated. Please manually restart Flow.</system:String>
 
     <!--  Plugin Infos  -->
     <system:String x:Key="plugin_pluginsmanager_plugin_name">Plugins Manager</system:String>
@@ -48,4 +54,5 @@
 
     <!--  Settings menu items  -->
     <system:String x:Key="plugin_pluginsmanager_plugin_settings_unknown_source">Install from unknown source warning</system:String>
+    <system:String x:Key="plugin_pluginsmanager_plugin_settings_auto_restart">Automatically restart Flow Launcher after installing/uninstalling/updating plugins</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
index 6b6945d37..77fa3b981 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
@@ -117,9 +117,19 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 return;
             }
 
-            var message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_prompt"),
-                plugin.Name, plugin.Author,
-                Environment.NewLine, Environment.NewLine);
+            string message;
+            if (Settings.AutoRestartAfterChanging)
+            {
+                message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_prompt"),
+                                        plugin.Name, plugin.Author,
+                                        Environment.NewLine, Environment.NewLine);
+            }
+            else
+            {
+                message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_prompt_no_restart"),
+                                        plugin.Name, plugin.Author,
+                                        Environment.NewLine);
+            }
 
             if (MessageBox.Show(message, Context.API.GetTranslation("plugin_pluginsmanager_install_title"),
                     MessageBoxButton.YesNo) == MessageBoxResult.No)
@@ -140,6 +150,7 @@ namespace Flow.Launcher.Plugin.PluginsManager
             }
             catch (Exception e)
             {
+                // TODO use toast to optimize error prompt
                 if (e is HttpRequestException)
                     MessageBox.Show(Context.API.GetTranslation("plugin_pluginsmanager_download_error"),
                         Context.API.GetTranslation("plugin_pluginsmanager_downloading_plugin"));
@@ -153,10 +164,19 @@ namespace Flow.Launcher.Plugin.PluginsManager
                 return;
             }
 
-            Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_installing_plugin"),
-                string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_success_restart"), plugin.Name));
-
-            Context.API.RestartApp();
+            if (Settings.AutoRestartAfterChanging)
+            {
+                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_installing_plugin"),
+                                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_success_restart"),
+                                    plugin.Name));
+                Context.API.RestartApp();
+            }
+            else
+            {
+                Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_installing_plugin"),
+                                    string.Format(Context.API.GetTranslation("plugin_pluginsmanager_install_success_no_restart"),
+                                    plugin.Name));
+            }
         }
 
         internal async ValueTask<List<Result>> RequestUpdateAsync(string search, CancellationToken token, bool usePrimaryUrlOnly = false)
@@ -201,10 +221,20 @@ namespace Flow.Launcher.Plugin.PluginsManager
                         IcoPath = x.IcoPath,
                         Action = e =>
                         {
-                            string message = string.Format(
-                                Context.API.GetTranslation("plugin_pluginsmanager_update_prompt"),
-                                x.Name, x.Author,
-                                Environment.NewLine, Environment.NewLine);
+
+                            string message;
+                            if (Settings.AutoRestartAfterChanging)
+                            {
+                                message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_prompt"),
+                                                        x.Name, x.Author,
+                                                        Environment.NewLine, Environment.NewLine);
+                            }
+                            else
+                            {
+                                message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_prompt_no_restart"),
+                                                        x.Name, x.Author,
+                                                        Environment.NewLine);
+                            }
 
                             if (MessageBox.Show(message,
                                     Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
@@ -215,14 +245,26 @@ namespace Flow.Launcher.Plugin.PluginsManager
                                 var downloadToFilePath = Path.Combine(DataLocation.PluginsDirectory,
                                     $"{x.Name}-{x.NewVersion}.zip");
 
-                                Task.Run(async delegate
+                                _ = Task.Run(async delegate
                                 {
                                     await Http.DownloadAsync(x.PluginNewUserPlugin.UrlDownload, downloadToFilePath)
                                         .ConfigureAwait(false);
 
                                     Install(x.PluginNewUserPlugin, downloadToFilePath);
 
-                                    Context.API.RestartApp();
+                                    if (Settings.AutoRestartAfterChanging)
+                                    {
+                                        Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
+                                                            string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_success_restart"),
+                                                            x.Name));
+                                        Context.API.RestartApp();
+                                    }
+                                    else
+                                    {
+                                        Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_update_title"),
+                                                            string.Format(Context.API.GetTranslation("plugin_pluginsmanager_update_success_no_restart"),
+                                                            x.Name));
+                                    }
                                 }).ContinueWith(t =>
                                 {
                                     Log.Exception("PluginsManager", $"Update failed for {x.Name}",
@@ -454,10 +496,19 @@ namespace Flow.Launcher.Plugin.PluginsManager
                         IcoPath = x.Metadata.IcoPath,
                         Action = e =>
                         {
-                            string message = string.Format(
-                                Context.API.GetTranslation("plugin_pluginsmanager_uninstall_prompt"),
-                                x.Metadata.Name, x.Metadata.Author,
-                                Environment.NewLine, Environment.NewLine);
+                            string message;
+                            if (Settings.AutoRestartAfterChanging)
+                            {
+                                message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_uninstall_prompt"),
+                                                        x.Metadata.Name, x.Metadata.Author,
+                                                        Environment.NewLine, Environment.NewLine);
+                            }
+                            else
+                            {
+                                message = string.Format(Context.API.GetTranslation("plugin_pluginsmanager_uninstall_prompt_no_restart"),
+                                                        x.Metadata.Name, x.Metadata.Author,
+                                                        Environment.NewLine);
+                            }
 
                             if (MessageBox.Show(message,
                                     Context.API.GetTranslation("plugin_pluginsmanager_uninstall_title"),
@@ -465,7 +516,16 @@ namespace Flow.Launcher.Plugin.PluginsManager
                             {
                                 Application.Current.MainWindow.Hide();
                                 Uninstall(x.Metadata);
-                                Context.API.RestartApp();
+                                if (Settings.AutoRestartAfterChanging)
+                                {
+                                    Context.API.RestartApp();
+                                }
+                                else
+                                {
+                                    Context.API.ShowMsg(Context.API.GetTranslation("plugin_pluginsmanager_uninstall_title"),
+                                                        string.Format(Context.API.GetTranslation("plugin_pluginsmanager_uninstall_success_no_restart"),
+                                                        x.Metadata.Name));
+                                }
 
                                 return true;
                             }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs
index aa35f02b5..f23ff71f0 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Settings.cs
@@ -9,5 +9,7 @@
         internal const string UpdateCommand = "update";
 
         public bool WarnFromUnknownSource { get; set; } = true;
+        
+        public bool AutoRestartAfterChanging { get; set; } = false;
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
index 672884f80..1c71507fc 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/ViewModels/SettingsViewModel.cs
@@ -17,5 +17,11 @@
             get => Settings.WarnFromUnknownSource;
             set => Settings.WarnFromUnknownSource = value;
         }
+
+        public bool AutoRestartAfterChanging
+        { 
+            get => Settings.AutoRestartAfterChanging;
+            set => Settings.AutoRestartAfterChanging = value;
+        }
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
index a62a032f7..18be0d2ca 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
@@ -12,10 +12,22 @@
             <ColumnDefinition Width="400" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
         <CheckBox
             Grid.Column="0"
+            Grid.Row="0"
             Padding="8,0,0,0"
             Content="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
             IsChecked="{Binding WarnFromUnknownSource}" />
+        <CheckBox
+            Grid.Column="0"
+            Grid.Row="1"
+            Margin="0,20,0,0"
+            Padding="8,0,0,0"
+            Content="{DynamicResource plugin_pluginsmanager_plugin_settings_auto_restart}"
+            IsChecked="{Binding AutoRestartAfterChanging}" />
     </Grid>
 </UserControl>