diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index 07d9905e..8d682ac9 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -11,14 +11,13 @@
         <nav class="navbar">
             <Logo />
             <Menu Orientation="Vertical" />
-            <Search CssClass="px-3 d-none d-md-block" />
         </nav>
     </div>
 
     <div class="main g-0">
         <div class="top-row px-4">
             <div class="ms-auto">
-                <Search CssClass="me-3 text-center bg-primary d-inline-block d-md-none" Position="Top" />
+                <Search CssClass="me-3 text-center d-inline-block" />
                 <UserProfile />
                 <Login />
                 <ControlPanel LanguageDropdownAlignment="right" />
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
index 481fa649..2e8a7265 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css
@@ -129,9 +129,8 @@
         display: none !important;
     }
 
-    .app-search input + button{
+    .app-search input + button {
         position: initial;
-        color: #fff;
         padding-top: 7px;
         padding-bottom: 7px;
     }
@@ -139,6 +138,7 @@
     .app-search:active, .app-search:hover {
         display: block;
         position: fixed;
+        color: #fff;
         top: 0;
         min-height: 60px;
         width: 100%;
@@ -147,18 +147,18 @@
         border-radius: 0;
     }
 
-    .app-search:active .app-form-inline, .app-search:hover .app-form-inline{
+    .app-search:active .app-form-inline, .app-search:hover .app-form-inline {
         margin: 10px auto;
         position: relative;
         display: block;
         max-width: 80%;
     }
 
-    .app-search:active .app-form-inline input, .app-search:hover .app-form-inline input{
+    .app-search:active .app-form-inline input, .app-search:hover .app-form-inline input {
         width: 100%;
         display: block !important;
     }
-    .app-search:active .app-form-inline input + button, .app-search:hover .app-form-inline input + button{
+    .app-search:active .app-form-inline input + button, .app-search:hover .app-form-inline input + button {
         position: absolute;
         color: rgb(42, 159, 214);
         padding-top: 6px;
diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css
index 862165b4..6bb1aacb 100644
--- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css
+++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css
@@ -137,9 +137,8 @@ div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu
         display: none !important;
     }
 
-    .app-search input + button{
+    .app-search input + button {
         position: initial;
-        color: #fff;
         padding-top: 7px;
         padding-bottom: 7px;
     }
@@ -155,18 +154,18 @@ div.app-moduleactions a.dropdown-toggle, div.app-moduleactions div.dropdown-menu
         border-radius: 0;
     }
 
-    .app-search:active .app-form-inline, .app-search:hover .app-form-inline{
+    .app-search:active .app-form-inline, .app-search:hover .app-form-inline {
         margin: 10px auto;
         position: relative;
         display: block;
         max-width: 80%;
     }
 
-    .app-search:active .app-form-inline input, .app-search:hover .app-form-inline input{
+    .app-search:active .app-form-inline input, .app-search:hover .app-form-inline input {
         width: 100%;
         display: block !important;
     }
-    .app-search:active .app-form-inline input + button, .app-search:hover .app-form-inline input + button{
+    .app-search:active .app-form-inline input + button, .app-search:hover .app-form-inline input + button {
         position: absolute;
         color: rgb(42, 159, 214);
         padding-top: 6px;