diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index 171ab885c..b0234619e 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -101,18 +101,11 @@
                             <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                         </td>
                         <td>
-                            <select id="Theme" class="form-control" @onchange="(e => ThemeChanged(e))">
+                            <select id="Theme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))">
                                 <option value="-">&lt;@Localizer["Inherit From Site"]&gt;</option>
                                 @foreach (var theme in _themes)
                                 {
-                                    if (theme.TypeName == _themetype)
-                                    {
-                                        <option value="@theme.TypeName" selected>@theme.Name</option>
-                                    }
-                                    else
-                                    {
-                                        <option value="@theme.TypeName">@theme.Name</option>
-                                    }
+                                    <option value="@theme.TypeName">@theme.Name</option>
                                 }
                             </select>
                         </td>
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 5efdd992b..e1229e43e 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -23,18 +23,11 @@
                         <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
                     </td>
                     <td>
-                        <select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))">
+                        <select id="Parent" class="form-control" value="@_parentid" @onchange="(e => ParentChanged(e))">
                             <option value="-1">&lt;@Localizer["Site Root"]&gt;</option>
                             @foreach (Page page in _pageList)
                             {
-                                if (page.PageId.ToString() == _parentid)
-                                {
-                                    <option value="@(page.PageId)" selected>@(new string('-', page.Level * 2))@(page.Name)</option>
-                                }
-                                else
-                                {
-                                    <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
-                                }
+                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
                             }
                         </select>
                     </td>
@@ -112,18 +105,11 @@
                             <Label For="Theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
                         </td>
                         <td>
-                            <select id="Theme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                                <option value="-">&lt;Inherit From Site&gt;</option>
+                            <select id="Theme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))">
+                                <option value="-">&lt;@Localizer["Inherit From Site"]&gt;</option>
                                 @foreach (var theme in _themes)
                                 {
-                                    if (theme.TypeName == _themetype)
-                                    {
-                                        <option value="@theme.TypeName" selected>@theme.Name</option>
-                                    }
-                                    else
-                                    {
-                                        <option value="@theme.TypeName">@theme.Name</option>
-                                    }
+                                    <option value="@theme.TypeName">@theme.Name</option>
                                 }
                             </select>
                         </td>
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor
index 62de4921f..4fcb5dd39 100644
--- a/Oqtane.Client/Modules/Admin/Site/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Site/Index.razor
@@ -82,18 +82,11 @@
                 <Label For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
             </td>
             <td>
-                <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
+                <select id="defaultTheme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))">
                     <option value="-">&lt;@Localizer["Select Theme"]&gt;</option>
                     @foreach (var theme in _themes)
                     {
-                        if (theme.TypeName == _themetype)
-                        {
-                            <option value="@theme.TypeName" selected>@theme.Name</option>
-                        }
-                        else
-                        {
-                            <option value="@theme.TypeName">@theme.Name</option>
-                        }
+                        <option value="@theme.TypeName">@theme.Name</option>
                     }
                 </select>
             </td>
diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
index b1afc85ce..6d28aee62 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
@@ -31,18 +31,11 @@
                 <Label For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label>
             </td>
             <td>
-                <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
+                <select id="defaultTheme" class="form-control" value="@_themetype" @onchange="(e => ThemeChanged(e))">
                     <option value="-">&lt;@Localizer["Select Theme"]&gt;</option>
                     @foreach (var theme in _themes)
                     {
-                        if (theme.TypeName == _themetype)
-                        {
-                            <option value="@theme.TypeName" selected>@theme.Name</option>
-                        }
-                        else
-                        {
-                            <option value="@theme.TypeName">@theme.Name</option>
-                        }
+                        <option value="@theme.TypeName">@theme.Name</option>
                     }
                 </select>
             </td>
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index f46502027..90bc48c54 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -12,21 +12,14 @@
                 @if (ShowFolders || FolderId <= 0)
                 {
                     <div>
-                        <select class="form-control" @onchange="(e => FolderChanged(e))">
+                        <select class="form-control" value="@FolderId" @onchange="(e => FolderChanged(e))">
                             @if (string.IsNullOrEmpty(Folder))
                             {
                                 <option value="-1">&lt;@Localizer["Select Folder"]&gt;</option>
                             }
                             @foreach (Folder folder in _folders)
                             {
-                                if (folder.FolderId == FolderId)
-                                {
-                                    <option value="@(folder.FolderId)" selected>@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                                }
-                                else
-                                {
-                                    <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                                }
+                                <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
                             }
                         </select>
                     </div>
@@ -34,18 +27,11 @@
                 @if (ShowFiles)
                 {
                     <div>
-                        <select class="form-control" @onchange="(e => FileChanged(e))">
+                        <select class="form-control" value="@FileId" @onchange="(e => FileChanged(e))">
                             <option value="-1">&lt;@Localizer["Select File"]&gt;</option>
                             @foreach (File file in _files)
                             {
-                                if (file.FileId == FileId)
-                                {
-                                    <option value="@(file.FileId)" selected>@(file.Name)</option>
-                                }
-                                else
-                                {
-                                    <option value="@(file.FileId)">@(file.Name)</option>
-                                }
+                                <option value="@(file.FileId)">@(file.Name)</option>
                             }
                         </select>
                     </div>