diff --git a/Client/WebServer/index.html b/Client/WebServer/index.html
index 9d70c869d..5e57190e2 100644
--- a/Client/WebServer/index.html
+++ b/Client/WebServer/index.html
@@ -70,8 +70,7 @@
     </div>
     <div id="masterApp"></div>
     <div id="canvasApp"></div>
-    <div id="docs-space-div" class="docs-page" style="position:fixed; top:100000px; left:100000px">
-    </div>
+    <div id="docs-space-div" class="docs-page" style="position:fixed; top:100000px; left:100000px"><div id="docs-content-div"></div></div>
     <div id="chatApp" style="position:fixed; top:100000px; left:100000px">
         <iframe id="chatIFrame" style="border:none; " height="2000" width="900"></iframe>
     </div>
diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
index f8ad1f6e2..dd1a6d9e5 100644
--- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
+++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js
@@ -842,9 +842,10 @@ function newSuperalgosDocSpace() {
         HTML = HTML + '<center><img src="Images/superalgos-logo.png" class="docs-image-logo-search" width=400></center>'
         HTML = HTML + '<center><div class="docs-font-normal docs-search-box"><input class="docs-search-input" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></input></div></center>'
         HTML = HTML + '</div>'
-        let docsSpaceDiv = document.getElementById('docs-space-div')
-        docsSpaceDiv.innerHTML = HTML + addFooter()
+        let docsContentDiv = document.getElementById('docs-content-div')
+        docsContentDiv.innerHTML = HTML + addFooter()
         detectEnterOnSearchBox()
+        setFocusOnSearchBox()
     }
 
     function detectCommands() {
@@ -1268,10 +1269,11 @@ function newSuperalgosDocSpace() {
             // End Section
             HTML = HTML + '</section>'
 
-            let docsSpaceDiv = document.getElementById('docs-space-div')
-            docsSpaceDiv.innerHTML = HTML + addFooter()
+            let docsContentDiv = document.getElementById('docs-content-div')
+            docsContentDiv.innerHTML = HTML + addFooter()
 
             detectEnterOnSearchBox()
+            setFocusOnSearchBox()
         }
     }
 
@@ -1517,10 +1519,11 @@ function newSuperalgosDocSpace() {
                 HTML = HTML.replace(tab.toUpperCase() + '_TOTAL_RESULTS', resultCounter)
             }
 
-            let docsSpaceDiv = document.getElementById('docs-space-div')
-            docsSpaceDiv.innerHTML = HTML + addFooter()
+            let docsContentDiv = document.getElementById('docs-content-div')
+            docsContentDiv.innerHTML = HTML + addFooter()
 
             detectEnterOnSearchBox()
+            setFocusOnSearchBox()
         }
     }
 
@@ -1529,7 +1532,6 @@ function newSuperalgosDocSpace() {
         if (command !== undefined) {
             element.value = command
         }
-        element.focus()
         element.addEventListener("keyup", function (event) {
             if (event.key === "Enter" || event.keyCode === 13) {
                 command = element.value
@@ -1538,6 +1540,11 @@ function newSuperalgosDocSpace() {
         });
     }
 
+    function setFocusOnSearchBox() {
+        const element = document.getElementsByClassName("docs-search-input")[0]
+        element.focus()
+    }
+
     function scrollToElement(htmlElementId) {
         let myElement = document.getElementById(htmlElementId)
         let topPos = myElement.offsetTop
@@ -1717,8 +1724,8 @@ function newSuperalgosDocSpace() {
             /*
             Here we inject the HTML we built into the DOM at the Docs Space Div.
             */
-            let docsSpaceDiv = document.getElementById('docs-space-div')
-            docsSpaceDiv.innerHTML = HTML + addFooter()
+            let docsContentDiv = document.getElementById('docs-content-div')
+            docsContentDiv.innerHTML = HTML + addFooter()
 
             hightlightEmbeddedCode()
             detectEnterOnSearchBox()
@@ -2788,7 +2795,7 @@ function newSuperalgosDocSpace() {
             }
 
             function hightlightEmbeddedCode() {
-                _self.Prism.highlightAllUnder(docsSpaceDiv, true, onHighlighted)
+                _self.Prism.highlightAllUnder(docsContentDiv, true, onHighlighted)
                 function onHighlighted() {
                     // nothing to do here
                 }