diff --git a/src/Ryujinx/Common/ApplicationHelper.cs b/src/Ryujinx/Common/ApplicationHelper.cs
index f4f76d0d3..86e5ee310 100644
--- a/src/Ryujinx/Common/ApplicationHelper.cs
+++ b/src/Ryujinx/Common/ApplicationHelper.cs
@@ -13,7 +13,7 @@ using LibHac.Tools.Fs;
 using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.NcaUtils;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
+using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.Configuration;
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
index 897f7325c..cd6700aea 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml.cs
@@ -9,6 +9,7 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
+using Ryujinx.Ava.UI.Views.Misc;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
diff --git a/src/Ryujinx/UI/Controls/RyujinxControl.cs b/src/Ryujinx/UI/Controls/RyujinxControl.cs
index 5e220faa6..748d7ed94 100644
--- a/src/Ryujinx/UI/Controls/RyujinxControl.cs
+++ b/src/Ryujinx/UI/Controls/RyujinxControl.cs
@@ -9,9 +9,15 @@ namespace Ryujinx.Ava.UI.Controls
     {
         public TViewModel ViewModel
         {
-            get => (TViewModel)DataContext ?? throw new InvalidOperationException(
-                $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
-                $"Actual type is {DataContext?.GetType().AsPrettyString()}");
+            get
+            {
+                if (DataContext is not TViewModel viewModel)
+                    throw new InvalidOperationException(
+                        $"Underlying DataContext is not of type {typeof(TViewModel).AsPrettyString()}; " +
+                        $"Actual type is {DataContext?.GetType().AsPrettyString()}");
+
+                return viewModel;
+            }
             set => DataContext = value;
         }
     }
diff --git a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml b/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml
similarity index 99%
rename from src/Ryujinx/UI/Controls/ApplicationDataView.axaml
rename to src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml
index 92e4d1ac3..a36b637ec 100644
--- a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml
@@ -7,7 +7,7 @@
              xmlns:ui="using:FluentAvalonia.UI.Controls"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Controls.ApplicationDataView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationDataView"
              x:DataType="viewModels:ApplicationDataViewModel">
     <StackPanel Orientation="Horizontal">
         <Image Margin="0"
diff --git a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs b/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs
similarity index 97%
rename from src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs
rename to src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs
index af18482d5..7bd05ba4f 100644
--- a/src/Ryujinx/UI/Controls/ApplicationDataView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationDataView.axaml.cs
@@ -4,6 +4,7 @@ using Avalonia.Interactivity;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.UI.Windows;
@@ -12,7 +13,7 @@ using Ryujinx.Ava.Utilities.Compat;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationDataView : RyujinxControl<ApplicationDataViewModel>
     {
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml
similarity index 99%
rename from src/Ryujinx/UI/Controls/ApplicationGridView.axaml
rename to src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml
index 95eadc031..4d1db1507 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.ApplicationGridView"
+    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationGridView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs b/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml.cs
similarity index 94%
rename from src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs
rename to src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml.cs
index 59cbd0a9b..bb7d62c8f 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationGridView.axaml.cs
@@ -1,12 +1,13 @@
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationGridView : RyujinxControl<MainWindowViewModel>
     {
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml
similarity index 99%
rename from src/Ryujinx/UI/Controls/ApplicationListView.axaml
rename to src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml
index aa52506c3..c9926301b 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml
@@ -1,5 +1,5 @@
 <UserControl
-    x:Class="Ryujinx.Ava.UI.Controls.ApplicationListView"
+    x:Class="Ryujinx.Ava.UI.Views.Misc.ApplicationListView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs b/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs
similarity index 97%
rename from src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
rename to src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs
index 20a0cae7c..e393d0836 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/ApplicationListView.axaml.cs
@@ -2,6 +2,7 @@ using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
@@ -9,7 +10,7 @@ using Ryujinx.Ava.Utilities.Compat;
 using System;
 using System.Linq;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class ApplicationListView : RyujinxControl<MainWindowViewModel>
     {
diff --git a/src/Ryujinx/UI/Controls/DlcSelectView.axaml b/src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml
similarity index 98%
rename from src/Ryujinx/UI/Controls/DlcSelectView.axaml
rename to src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml
index 790c6dd3b..f44bc3261 100644
--- a/src/Ryujinx/UI/Controls/DlcSelectView.axaml
+++ b/src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml
@@ -7,7 +7,7 @@
              xmlns:models="using:Ryujinx.Ava.Common.Models"
              xmlns:viewModels="using:Ryujinx.Ava.UI.ViewModels"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="Ryujinx.Ava.UI.Controls.DlcSelectView"
+             x:Class="Ryujinx.Ava.UI.Views.Misc.DlcSelectView"
              x:DataType="viewModels:DlcSelectViewModel">
     <Grid RowDefinitions="*,Auto,*">
         <TextBlock
diff --git a/src/Ryujinx/UI/Controls/DlcSelectView.axaml.cs b/src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml.cs
similarity index 96%
rename from src/Ryujinx/UI/Controls/DlcSelectView.axaml.cs
rename to src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml.cs
index 1fc06d950..3db247dee 100644
--- a/src/Ryujinx/UI/Controls/DlcSelectView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Misc/DlcSelectView.axaml.cs
@@ -3,12 +3,13 @@ using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Common.Models;
+using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Threading.Tasks;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Views.Misc
 {
     public partial class DlcSelectView : RyujinxControl<DlcSelectViewModel>
     {
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml b/src/Ryujinx/UI/Windows/MainWindow.axaml
index 7606d411b..498b77100 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml
@@ -9,6 +9,7 @@
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
     xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
     xmlns:main="clr-namespace:Ryujinx.Ava.UI.Views.Main"
+    xmlns:viewsMisc="clr-namespace:Ryujinx.Ava.UI.Views.Misc"
     Cursor="{Binding Cursor}"
     Title="{Binding Title}"
     WindowState="{Binding WindowState}"
@@ -73,7 +74,7 @@
                     <main:MainViewControls
                         Name="ViewControls"
                         Grid.Row="0"/>
-                    <controls:ApplicationListView
+                    <viewsMisc:ApplicationListView
                         x:Name="ApplicationList"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"
@@ -81,7 +82,7 @@
                         HorizontalContentAlignment="Stretch"
                         VerticalContentAlignment="Stretch"
                         IsVisible="{Binding IsList}" />
-                    <controls:ApplicationGridView
+                    <viewsMisc:ApplicationGridView
                         x:Name="ApplicationGrid"
                         Grid.Row="1"
                         HorizontalAlignment="Stretch"
diff --git a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml b/src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml
similarity index 95%
rename from src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
rename to src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml
index 546431e18..290eed828 100644
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml
+++ b/src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml
@@ -1,5 +1,5 @@
 <Window
-    x:Class="Ryujinx.Ava.UI.Controls.UpdateWaitWindow"
+    x:Class="Ryujinx.Ava.UI.Windows.UpdateWaitWindow"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs b/src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml.cs
similarity index 93%
rename from src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs
rename to src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml.cs
index 7ad1ee332..b4226b4b2 100644
--- a/src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/UpdateWaitWindow.axaml.cs
@@ -1,8 +1,7 @@
 using Avalonia.Controls;
-using Ryujinx.Ava.UI.Windows;
 using System.Threading;
 
-namespace Ryujinx.Ava.UI.Controls
+namespace Ryujinx.Ava.UI.Windows
 {
     public partial class UpdateWaitWindow : StyleableWindow
     {