diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
index 2c67444a..92cc01d4 100644
--- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor
@@ -15,7 +15,7 @@
 
     <div class="main g-0">
         <div class="top-row px-4">
-            <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel /></div>
+            <div class="ms-auto"><UserProfile /> <Login /> <ControlPanel LanguageDropdownAlignment="right" /></div>
         </div>
         <div class="container">
             <div class="row px-4">
diff --git a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
index a9bc3a44..a888d534 100644
--- a/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
@@ -17,7 +17,7 @@
 
 @if (ShowLanguageSwitcher)
 {
-    <LanguageSwitcher />
+    <LanguageSwitcher DropdownAlignment="@LanguageDropdownAlignment" />
 }
 
 @if (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered)))
@@ -239,6 +239,24 @@
 }
 
 @code{
+    [Parameter]
+    public string ButtonClass { get; set; } = "btn-outline-secondary";
+
+    [Parameter]
+    public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
+
+    [Parameter]
+    public string HeaderClass { get; set; } = "offcanvas-header";
+
+    [Parameter]
+    public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
+
+    [Parameter]
+    public bool ShowLanguageSwitcher { get; set; } = true;
+
+    [Parameter]
+    public string LanguageDropdownAlignment { get; set; } // Empty or Left or Right
+
     private bool _canViewAdminDashboard = false;
     private bool _showEditMode = false;
     private bool _deleteConfirmation = false;
@@ -295,21 +313,6 @@
         }
     }
 
-    [Parameter]
-    public string ButtonClass { get; set; } = "btn-outline-secondary";
-
-    [Parameter]
-    public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
-
-    [Parameter]
-    public string HeaderClass { get; set; } = "offcanvas-header";
-
-    [Parameter]
-    public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
-
-    [Parameter]
-    public bool ShowLanguageSwitcher { get; set; } = true;
-
     protected override async Task OnParametersSetAsync()
     {
         _canViewAdminDashboard = CanViewAdminDashboard();
diff --git a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
index 465de502..6bac57eb 100644
--- a/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
+++ b/Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
@@ -12,7 +12,7 @@
         <button id="btnCultures" type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="oi oi-globe"></span>
         </button>
-        <div class="dropdown-menu" aria-labelledby="btnCultures">
+        <div class="dropdown-menu @MenuAlignment" aria-labelledby="btnCultures">
             @foreach (var culture in _supportedCultures)
             {
                 <a class="dropdown-item @(CultureInfo.CurrentUICulture.Name == culture.Name ? "active" : String.Empty)" href="#" @onclick="@(async e => await SetCultureAsync(culture.Name))">@culture.DisplayName</a>
@@ -23,10 +23,15 @@
 
 @code{
     private IEnumerable<Culture> _supportedCultures;
+    [Parameter]
+    public string DropdownAlignment { get; set; } // Empty or Left or Right
+    private string MenuAlignment = string.Empty;
 
     protected override void OnParametersSet()
     {
-		var languages = PageState.Languages;
+        MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty;
+
+        var languages = PageState.Languages;
         _supportedCultures = languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
     }
 
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index e4ba70f7..261597aa 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -6,7 +6,7 @@
     <nav class="navbar navbar-dark bg-primary fixed-top">
         <Logo /><Menu Orientation="Horizontal" />
         <div class="controls ms-auto">
-            <div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login" /> <ControlPanel /></div>
+            <div class="controls-group"><UserProfile ShowRegister="@_register" /> <Login ShowLogin="@_login" /> <ControlPanel LanguageDropdownAlignment="right" /></div>
         </div>
     </nav>
     <div class="content">