diff --git a/GanjooRazor/Pages/Search.cshtml b/GanjooRazor/Pages/Search.cshtml
index a326a057..b92cdd76 100644
--- a/GanjooRazor/Pages/Search.cshtml
+++ b/GanjooRazor/Pages/Search.cshtml
@@ -42,6 +42,10 @@
             <div class="actionbox">
                 <form action="/search" method="get" id="searchform">
                     <input type="text" name="s" id="s" class="inputText" value="@Model.Query" placeholder="جستجو" />
+                    @if(Model.ExactSearch)
+                    {
+                        <input type="hidden" name="es" id="es" value="1" />
+                    }
                     <select name="author" id="author" onchange="onSelectedPoetChanged()">
 
                         @{
diff --git a/GanjooRazor/Pages/Search.cshtml.cs b/GanjooRazor/Pages/Search.cshtml.cs
index adc6132e..f904058b 100644
--- a/GanjooRazor/Pages/Search.cshtml.cs
+++ b/GanjooRazor/Pages/Search.cshtml.cs
@@ -145,6 +145,8 @@ namespace GanjooRazor.Pages
 
         public bool Quoted { get; set; }
 
+        public bool ExactSearch { get; set; }
+
         public async Task<IActionResult> OnGetAsync()
         {
             if (bool.Parse(Configuration["MaintenanceMode"]))
@@ -155,7 +157,8 @@ namespace GanjooRazor.Pages
             LoggedIn = !string.IsNullOrEmpty(Request.Cookies["Token"]);
 
             Query = Request.Query["s"].ApplyCorrectYeKe().Trim();
-            bool quotes = Query.IndexOf("\"") != -1 || Request.Query["es"] == "1";
+            ExactSearch = Request.Query["es"] == "1";
+            bool quotes = Query.IndexOf("\"") != -1 || ExactSearch;
             Query = LanguageUtils.MakeTextSearchable(Query); //replace zwnj with space
             if (quotes)
                 Query = $"\"{Query}\"";