diff --git a/Source/ChocolateyGui.Common.Windows/Utilities/ChocolateyMessageBox.cs b/Source/ChocolateyGui.Common.Windows/Utilities/ChocolateyMessageBox.cs
index 2cd19331b..bb8d31b74 100644
--- a/Source/ChocolateyGui.Common.Windows/Utilities/ChocolateyMessageBox.cs
+++ b/Source/ChocolateyGui.Common.Windows/Utilities/ChocolateyMessageBox.cs
@@ -11,110 +11,70 @@ namespace ChocolateyGui.Common.Windows.Utilities
 
     public static class ChocolateyMessageBox
     {
-        public static MessageBoxResult Show(string messageBoxText)
+public static MessageBoxResult Show(string messageBoxText)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(messageBoxText);
-            dummyWindow.Close();
-            return result;
+            return Show(messageBoxText, string.Empty);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(messageBoxText, caption);
-            dummyWindow.Close();
-            return result;
+            return Show(messageBoxText, caption, MessageBoxButton.OK);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(messageBoxText, caption, button);
-            dummyWindow.Close();
-            return result;
+            return Show(messageBoxText, caption, button, MessageBoxImage.None);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
+        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(messageBoxText, caption, button, icon, defaultResult, options);
-            dummyWindow.Show();
-            return result;
+            return Show(messageBoxText, caption, button, icon, MessageBoxResult.OK);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(messageBoxText, caption, button, icon, defaultResult);
-            dummyWindow.Show();
-            return result;
+            return Show(messageBoxText, caption, button, icon, defaultResult, MessageBoxOptions.None);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
+        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
         {
             var dummyWindow = DummyWindow();
             dummyWindow.Show();
-            var result = MessageBox.Show(messageBoxText, caption, button, icon);
+            var result = MessageBox.Show(messageBoxText, caption, button, icon, defaultResult, options);
             dummyWindow.Show();
             return result;
         }
 
-        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
+        public static MessageBoxResult Show(Window owner, string messageBoxText)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(owner, messageBoxText, caption, button, icon, defaultResult, options);
-            dummyWindow.Show();
-            return result;
+            return Show(owner, messageBoxText, string.Empty);
         }
 
-        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
+        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(owner, messageBoxText, caption, button, icon, defaultResult);
-            dummyWindow.Show();
-            return result;
+            return Show(owner, messageBoxText, caption, MessageBoxButton.OK);
         }
 
-        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
+        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(owner, messageBoxText, caption, button, icon);
-            dummyWindow.Show();
-            return result;
+            return Show(owner, messageBoxText, caption, button, MessageBoxImage.None);
         }
 
-        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button)
+        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(owner, messageBoxText, caption, button);
-            dummyWindow.Show();
-            return result;
+            return Show(owner, messageBoxText, caption, button, icon, MessageBoxResult.OK);
         }
 
-        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption)
+        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
         {
-            var dummyWindow = DummyWindow();
-            dummyWindow.Show();
-            var result = MessageBox.Show(owner, messageBoxText, caption);
-            dummyWindow.Show();
-            return result;
+            return Show(owner, messageBoxText, caption, button, icon, defaultResult, MessageBoxOptions.None);
         }
 
-        public static MessageBoxResult Show(Window owner, string messageBoxText)
+        public static MessageBoxResult Show(Window owner, string messageBoxText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, MessageBoxOptions options)
         {
             var dummyWindow = DummyWindow();
             dummyWindow.Show();
-            var result = MessageBox.Show(owner, messageBoxText);
+            var result = MessageBox.Show(owner, messageBoxText, caption, button, icon, defaultResult, options);
             dummyWindow.Show();
             return result;
         }