diff --git a/blazorbootstrap/Components/Modals/Modal.razor.cs b/blazorbootstrap/Components/Modals/Modal.razor.cs
index d840f81fe..01f1069c9 100644
--- a/blazorbootstrap/Components/Modals/Modal.razor.cs
+++ b/blazorbootstrap/Components/Modals/Modal.razor.cs
@@ -69,6 +69,7 @@ protected override async Task OnInitializedAsync()
     [JSInvokable]
     public async Task bsHiddenModal()
     {
+        isVisible = false;
         await OnHidden.InvokeAsync();
 
         if (ModalService is not null && IsServiceModal)
@@ -92,7 +93,6 @@ public async Task bsHiddenModal()
     /// </summary>
     public async Task HideAsync()
     {
-        isVisible = false;
         await JSRuntime.InvokeVoidAsync("window.blazorBootstrap.modal.hide", Id);
     }
 
diff --git a/blazorbootstrap/Components/ThemeSwitcher/ThemeSwitcher.razor b/blazorbootstrap/Components/ThemeSwitcher/ThemeSwitcher.razor
index 7b17523c0..c6594998f 100644
--- a/blazorbootstrap/Components/ThemeSwitcher/ThemeSwitcher.razor
+++ b/blazorbootstrap/Components/ThemeSwitcher/ThemeSwitcher.razor
@@ -4,7 +4,6 @@
 <div @ref="@Element" id="@Id" class="@ClassNames" style="@StyleNames" role="alert" @attributes="@AdditionalAttributes">
     <button class="btn btn-link nav-link py-2 px-0 px-lg-2 dropdown-toggle d-flex align-items-center" id="bb-theme" type="button" aria-expanded="false" data-bs-toggle="dropdown" data-bs-display="static" aria-label="Toggle theme (light)">
         <span class="blazorbootstrap-theme-indicator"><i class="bi bi-sun-fill"></i></span>
-        <small class="d-lg-none ms-2" id="bb-theme-text">Toggle theme</small>
     </button>
     <ul class="@DropdownMenuClassNames" aria-labelledby="bb-theme-text">
         <li class="blazorbootstrap-theme-item px-1">