diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
index d72dd057e..ea278b49b 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Main.cs
@@ -6,7 +6,6 @@ using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 using Mages.Core;
-using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin.Caculator.ViewModels;
 using Flow.Launcher.Plugin.Caculator.Views;
 
@@ -25,6 +24,9 @@ namespace Flow.Launcher.Plugin.Caculator
                         @")+$", RegexOptions.Compiled);
         private static readonly Regex RegBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled);
         private static Engine MagesEngine;
+        private const string comma = ",";
+        private const string dot = ".";
+
         private PluginInitContext Context { get; set; }
 
         private static Settings _settings;
@@ -60,7 +62,7 @@ namespace Flow.Launcher.Plugin.Caculator
                 {
                     case DecimalSeparator.Comma:
                     case DecimalSeparator.UseSystemLocale when CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator == ",":
-                        expression = query.Search.Replace(".", ",");
+                        expression = query.Search.Replace(",", ".");
                         break;
                     default:
                         expression = query.Search;
@@ -132,6 +134,10 @@ namespace Flow.Launcher.Plugin.Caculator
                 return false;
             }
 
+            if ((query.Search.Contains(dot) && GetDecimalSeparator() != dot) ||
+                (query.Search.Contains(comma) && GetDecimalSeparator() != comma))
+                return false;
+
             return true;
         }
 
@@ -155,8 +161,8 @@ namespace Flow.Launcher.Plugin.Caculator
             switch (_settings.DecimalSeparator)
             {
                 case DecimalSeparator.UseSystemLocale: return systemDecimalSeperator;
-                case DecimalSeparator.Dot: return ".";
-                case DecimalSeparator.Comma: return ",";
+                case DecimalSeparator.Dot: return dot;
+                case DecimalSeparator.Comma: return comma;
                 default: return systemDecimalSeperator;
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs b/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs
index 10cee364b..615514873 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Settings.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
 namespace Flow.Launcher.Plugin.Caculator
 {
     public class Settings