diff --git a/GanjooRazor/Pages/_InlineLoginPartial.cshtml b/GanjooRazor/Pages/_InlineLoginPartial.cshtml
index aff6dda8..d193d219 100644
--- a/GanjooRazor/Pages/_InlineLoginPartial.cshtml
+++ b/GanjooRazor/Pages/_InlineLoginPartial.cshtml
@@ -87,7 +87,16 @@
 
     </div>
 
-    
+    @if (Model.GanjoorPage != null && Model.GanjoorPage.Poem != null)
+    {
+        <div class="clear-both margin-15px" id="main-inline-div" style="display:none">
+            <input type="search" name="inline-search" id="inline-search" class="text-align-center" placeholder="جستجو در متن" size="35" value="" onkeyup="inlineHighlight()">
+            <a onclick="inlineUnHighlight()" role="button" class="cursor-pointer">
+                <i class="noindent-info-button close-button"></i>
+            </a>
+            <div id="inline-search-matches" class="inline-small"></div>
+        </div>
+    }
 
 </div>
 
diff --git a/GanjooRazor/Pages/_InlinePageUtilsPartial.cshtml b/GanjooRazor/Pages/_InlinePageUtilsPartial.cshtml
index 2600bad8..7be00d18 100644
--- a/GanjooRazor/Pages/_InlinePageUtilsPartial.cshtml
+++ b/GanjooRazor/Pages/_InlinePageUtilsPartial.cshtml
@@ -240,12 +240,11 @@
 
         @if(Model.GanjoorPage.Poem != null)
         {
-            <div class="clear-both margin-15px">
-                <input type="search" name="inline-search" id="inline-search" class="text-align-center" placeholder="جستجو در متن" size="35" value="" onkeyup="inlineHighlight()">
-                <a onclick="inlineUnHighlight()" role="button" class="cursor-pointer">
-                    <i class="noindent-info-button close-button"></i>
-                </a>
-                <div id="inline-search-matches" class="inline-small"></div>
+            <script>
+                
+            </script>
+            <div class="clear-both margin-15px" id="fake-inline-div">
+                <input type="search" name="fake-inline-search" id="fake-inline-search" class="text-align-center" placeholder="جستجو در متن" size="35" value="" oninput="displayMainInlineSearch()">
             </div>
         }
         
diff --git a/GanjooRazor/wwwroot/css/p8.css b/GanjooRazor/wwwroot/css/p8.css
index 56ffbae7..73e7322e 100644
--- a/GanjooRazor/wwwroot/css/p8.css
+++ b/GanjooRazor/wwwroot/css/p8.css
@@ -1996,6 +1996,7 @@ fieldset {
 .inline-small{
     display:inline;
     font-size:small;
+    color: gold;
 }
 
 
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index 57f62070..f3ac6e5a 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -1363,10 +1363,25 @@ function inlineHighlight() {
 
 function inlineUnHighlight() {
     document.getElementById('inline-search').value = '';
+    document.getElementById('fake-inline-div').value = '';
     document.getElementById('inline-search').classList.remove("background-red");
     $('#inline-search-matches').text('');
     var context = document.getElementById('garticle');
     $(context).unmark();
+
+    document.getElementById('fake-inline-div').style.display = 'block';
+    document.getElementById('main-inline-div').style.display = 'none';
+    document.getElementById('fake-inline-search').value = '';
+    document.getElementById('fake-inline-search').focus();
+}
+
+function displayMainInlineSearch() {
+    document.getElementById('fake-inline-div').style.display = 'none';
+    document.getElementById('main-inline-div').style.display = 'block';
+    var txt = document.getElementById('fake-inline-search').value;
+    document.getElementById('inline-search').value = txt;
+    document.getElementById('inline-search').setSelectionRange(txt.length, txt.length);
+    document.getElementById('inline-search').focus();
 }