diff --git a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
index 403b7264..b5eb7ade 100644
--- a/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
+++ b/Oqtane.Client/Modules/Controls/QuillJSTextEditor.razor
@@ -6,7 +6,7 @@
 @inject IStringLocalizer<QuillJSTextEditor> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="quill-text-editor">
+<div class="quill-text-editor @(_settingsVisible ? "d-none" : "d-block")">
     <TabStrip ActiveTab="@_activetab">
         @if (_allowRichText)
         {
@@ -63,6 +63,12 @@
                                     <button class="ql-link"></button>
                                 </span>
                             }
+                            @if (_hasAdminPermission)
+                            {
+                                <span class="ql-formats">
+                                    <button class="ql-settings" @onclick="OpenSettings"></button>
+                                </span>
+                            }
                         </div>
                         <div @ref="@_editorElement"></div>
                     </div>
@@ -88,6 +94,10 @@
                         @((MarkupString)"&nbsp;&nbsp;")
                         <button type="button" class="btn btn-secondary" @onclick="CloseRawFileManager">@Localizer["Close"]</button>
                     }
+                    else if(_hasAdminPermission)
+                    {
+                        <button type="button" class="btn btn-primary ms-1" @onclick="OpenSettings">@Localizer["Settings"]</button>
+                    }
                 </div>
                 @if (ReadOnly)
                 {
@@ -99,59 +109,56 @@
                 }
             </TabPanel>
         }
-        @if (_hasAdminPermission)
-        {
-            <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings" ResourceType="@resourceType">
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="AllowFileManagement" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-                    <div class="col-sm-9">
-                        <input type="checkbox" id="AllowFileManagement" class="form-check-input" @bind="_allowFileManagementSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="AllowRawHtml" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
-                    <div class="col-sm-9">
-                        <input type="checkbox" id="AllowRawHtml" class="form-check-input" @bind="_allowRawHtmlSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="AllowRichText" ResourceKey="AllowRichText" ResourceType="@resourceType" HelpText="Specify If Editors Can Use Rich Text Editor">Allow Rich Text: </Label>
-                    <div class="col-sm-9">
-                        <input type="checkbox" id="AllowRichText" class="form-check-input" @bind="_allowRichTextSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="Theme" ResourceKey="Theme" ResourceType="@resourceType" HelpText="Specify the Rich Text Editor's Theme">Theme: </Label>
-                    <div class="col-sm-9">
-                        <input type="text" id="Theme" class="form-control" @bind="_themeSetting" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="DebugLevel" ResourceKey="DebugLevel" ResourceType="@resourceType" HelpText="Specify the Debug Level">Debug Level: </Label>
-                    <div class="col-sm-9">
-                        <select id="DebugLevel" class="form-select" @bind="_debugLevelSetting">
-                            @foreach (var level in _debugLevels)
-                            {
-                                <option value="@level">@level</option>
-                            }
-                        </select>
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="ToolbarContent" ResourceKey="ToolbarContent" ResourceType="@resourceType" HelpText="Specify the Toolbar Content">Toolbar Content: </Label>
-                    <div class="col-sm-9">
-                        <textarea id="ToolbarContent" class="form-control" @bind="_toolbarContentSetting" rows="5" />
-                    </div>
-                </div>
-                <div class="row mb-1 align-items-center">
-                    <div class="col-sm-9 offset-sm-3">
-                        <button type="button" class="btn btn-success" @onclick="@(async () => await UpdateSettings())">@SharedLocalizer["Save"]</button>
-                    </div>
-                </div>
-            </TabPanel>
-        }
     </TabStrip>
 </div>
+<div class="quill-text-editor-settings @(_settingsVisible ? "d-block" : "d-none")">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowFileManagement" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowFileManagement" class="form-check-input" @bind="_allowFileManagementSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowRawHtml" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowRawHtml" class="form-check-input" @bind="_allowRawHtmlSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="AllowRichText" ResourceKey="AllowRichText" ResourceType="@resourceType" HelpText="Specify If Editors Can Use Rich Text Editor">Allow Rich Text: </Label>
+        <div class="col-sm-9">
+            <input type="checkbox" id="AllowRichText" class="form-check-input" @bind="_allowRichTextSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="Theme" ResourceKey="Theme" ResourceType="@resourceType" HelpText="Specify the Rich Text Editor's Theme">Theme: </Label>
+        <div class="col-sm-9">
+            <input type="text" id="Theme" class="form-control" @bind="_themeSetting" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="DebugLevel" ResourceKey="DebugLevel" ResourceType="@resourceType" HelpText="Specify the Debug Level">Debug Level: </Label>
+        <div class="col-sm-9">
+            <select id="DebugLevel" class="form-select" @bind="_debugLevelSetting">
+                @foreach (var level in _debugLevels)
+                {
+                    <option value="@level">@level</option>
+                }
+            </select>
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="ToolbarContent" ResourceKey="ToolbarContent" ResourceType="@resourceType" HelpText="Specify the Toolbar Content">Toolbar Content: </Label>
+        <div class="col-sm-9">
+            <textarea id="ToolbarContent" class="form-control" @bind="_toolbarContentSetting" rows="5" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <div class="col-sm-9 offset-sm-3">
+            <button type="button" class="btn btn-success" @onclick="@(async () => await UpdateSettings())">@SharedLocalizer["Save"]</button>
+        </div>
+    </div>
+</div>
 
 @code {
     private string resourceType = "Oqtane.Modules.Controls.QuillJSTextEditor, Oqtane.Client";
@@ -177,6 +184,7 @@
     private string _themeSetting = "snow";
     private string _debugLevelSetting = "info";
     private string _toolbarContentSetting = string.Empty;
+    private bool _settingsVisible;
 
     private bool _settingsLoaded;
 
@@ -427,6 +435,12 @@
         StateHasChanged();
     }
 
+    private void OpenSettings()
+    {
+        _settingsVisible = true;
+        StateHasChanged();
+    }
+
     private async Task LoadSettings()
     {
         try
diff --git a/Oqtane.Server/wwwroot/js/quill-interop.js b/Oqtane.Server/wwwroot/js/quill-interop.js
index 4598d7aa..3b1fbc69 100644
--- a/Oqtane.Server/wwwroot/js/quill-interop.js
+++ b/Oqtane.Server/wwwroot/js/quill-interop.js
@@ -19,6 +19,11 @@ Oqtane.RichTextEditor = {
         };
 
         new Quill(quillElement, options);
+        
+        var settingsButton = document.querySelector('.ql-toolbar button.ql-settings');
+        if (settingsButton !== null) {
+            settingsButton.innerHTML = '<svg viewBox="0 0 46 46"><g><path class="ql-stroke" d="M43.454,18.443h-2.437c-0.453-1.766-1.16-3.42-2.082-4.933l1.752-1.756c0.473-0.473,0.733-1.104,0.733-1.774 c0-0.669-0.262-1.301-0.733-1.773l-2.92-2.917c-0.947-0.948-2.602-0.947-3.545-0.001l-1.826,1.815 C30.9,6.232,29.296,5.56,27.529,5.128V2.52c0-1.383-1.105-2.52-2.488-2.52h-4.128c-1.383,0-2.471,1.137-2.471,2.52v2.607 c-1.766,0.431-3.38,1.104-4.878,1.977l-1.825-1.815c-0.946-0.948-2.602-0.947-3.551-0.001L5.27,8.205 C4.802,8.672,4.535,9.318,4.535,9.978c0,0.669,0.259,1.299,0.733,1.772l1.752,1.76c-0.921,1.513-1.629,3.167-2.081,4.933H2.501 C1.117,18.443,0,19.555,0,20.935v4.125c0,1.384,1.117,2.471,2.501,2.471h2.438c0.452,1.766,1.159,3.43,2.079,4.943l-1.752,1.763 c-0.474,0.473-0.734,1.106-0.734,1.776s0.261,1.303,0.734,1.776l2.92,2.919c0.474,0.473,1.103,0.733,1.772,0.733 s1.299-0.261,1.773-0.733l1.833-1.816c1.498,0.873,3.112,1.545,4.878,1.978v2.604c0,1.383,1.088,2.498,2.471,2.498h4.128 c1.383,0,2.488-1.115,2.488-2.498v-2.605c1.767-0.432,3.371-1.104,4.869-1.977l1.817,1.812c0.474,0.475,1.104,0.735,1.775,0.735 c0.67,0,1.301-0.261,1.774-0.733l2.92-2.917c0.473-0.472,0.732-1.103,0.734-1.772c0-0.67-0.262-1.299-0.734-1.773l-1.75-1.77 c0.92-1.514,1.627-3.179,2.08-4.943h2.438c1.383,0,2.52-1.087,2.52-2.471v-4.125C45.973,19.555,44.837,18.443,43.454,18.443z M22.976,30.85c-4.378,0-7.928-3.517-7.928-7.852c0-4.338,3.55-7.85,7.928-7.85c4.379,0,7.931,3.512,7.931,7.85 C30.906,27.334,27.355,30.85,22.976,30.85z" /></g></svg>';
+        }
     },
     getQuillContent: function (editorElement) {
         return JSON.stringify(editorElement.__quill.getContents());