diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
index 545f343f2..a4c01fc21 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -212,17 +212,8 @@ namespace Flow.Launcher.Plugin.Calculator
                         var parts = processedStr.Split('.');
                         if (parts.Length > 1)
                         {
-                            bool isGrouped = true;
-                            for (var i = 1; i < parts.Length; i++)
-                            {
-                                if (parts[i].Length != 3)
-                                {
-                                    isGrouped = false;
-                                    break;
-                                }
-                            }
-
-                            if (isGrouped)
+                            var culture = CultureInfo.CurrentCulture;
+                            if (IsValidGrouping(parts, culture.NumberFormat.NumberGroupSizes))
                             {
                                 processedStr = processedStr.Replace(groupSep, "");
                             }
@@ -300,7 +291,6 @@ namespace Flow.Launcher.Plugin.Calculator
             return true;
         }
 
-
         private string FormatResult(decimal roundedResult)
         {
             string decimalSeparator = GetDecimalSeparator();
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/MainRegexHelper.cs b/Plugins/Flow.Launcher.Plugin.Calculator/MainRegexHelper.cs
index dacc249d9..0746e4556 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/MainRegexHelper.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/MainRegexHelper.cs
@@ -4,15 +4,15 @@ namespace Flow.Launcher.Plugin.Calculator;
 
 internal static partial class MainRegexHelper
 {
-    [GeneratedRegex(@"-?[\d\.,]+", RegexOptions.Compiled)]
+    [GeneratedRegex(@"-?[\d\.,'\u00A0\u202F]+", RegexOptions.Compiled | RegexOptions.CultureInvariant)]
     public static partial Regex GetNumberRegex();
 
     [GeneratedRegex(@"\B(?=(\d{3})+(?!\d))", RegexOptions.Compiled)]
     public static partial Regex GetThousandGroupRegex();
 
-    [GeneratedRegex(@"\bpow(\((?:[^()\[\]]|\((?<Depth>)|\)(?<-Depth>)|\[(?<Depth>)|\](?<-Depth>))*(?(Depth)(?!))\))", RegexOptions.Compiled | RegexOptions.RightToLeft | RegexOptions.IgnoreCase)]
+    [GeneratedRegex(@"\bpow(\((?:[^()\[\]]|\((?<Depth>)|\)(?<-Depth>)|\[(?<Depth>)|\](?<-Depth>))*(?(Depth)(?!))\))", RegexOptions.Compiled | RegexOptions.RightToLeft | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
     public static partial Regex GetPowRegex();
 
-    [GeneratedRegex(@"\b(sqrt|pow|factorial|abs|sign|ceil|floor|round|exp|log|log2|log10|min|max|lt|eq|gt|sin|cos|tan|arcsin|arccos|arctan|isnan|isint|isprime|isinfty|rand|randi|type|is|as|length|throw|catch|eval|map|clamp|lerp|regex|shuffle)\s*\(", RegexOptions.Compiled | RegexOptions.IgnoreCase)]
+    [GeneratedRegex(@"\b(sqrt|pow|factorial|abs|sign|ceil|floor|round|exp|log|log2|log10|min|max|lt|eq|gt|sin|cos|tan|arcsin|arccos|arctan|isnan|isint|isprime|isinfty|rand|randi|type|is|as|length|throw|catch|eval|map|clamp|lerp|regex|shuffle)\s*\(", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
     public static partial Regex GetFunctionRegex();
 }