diff --git a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs b/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs
index 964e3ed9..01db546b 100644
--- a/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs	
+++ b/app/MindWork AI Studio/Components/Blocks/Workspaces.razor.cs	
@@ -3,13 +3,13 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 
 using AIStudio.Chat;
-using AIStudio.Components.CommonDialogs;
+using AIStudio.Dialogs;
 using AIStudio.Settings;
 using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions;
+using DialogOptions = AIStudio.Dialogs.DialogOptions;
 
 namespace AIStudio.Components.Blocks;
 
diff --git a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs
index 9a6f93f7..57f3887e 100644
--- a/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs	
+++ b/app/MindWork AI Studio/Components/Layout/MainLayout.razor.cs	
@@ -1,4 +1,4 @@
-using AIStudio.Components.CommonDialogs;
+using AIStudio.Dialogs;
 using AIStudio.Settings;
 using AIStudio.Settings.DataModel;
 using AIStudio.Tools;
@@ -6,7 +6,7 @@ using AIStudio.Tools;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
 
-using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions;
+using DialogOptions = AIStudio.Dialogs.DialogOptions;
 
 namespace AIStudio.Components.Layout;
 
diff --git a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs b/app/MindWork AI Studio/Components/Pages/Chat.razor.cs
index a5066ede..07189767 100644
--- a/app/MindWork AI Studio/Components/Pages/Chat.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/Chat.razor.cs	
@@ -1,6 +1,6 @@
 using AIStudio.Chat;
 using AIStudio.Components.Blocks;
-using AIStudio.Components.CommonDialogs;
+using AIStudio.Dialogs;
 using AIStudio.Provider;
 using AIStudio.Settings;
 using AIStudio.Settings.DataModel;
@@ -9,7 +9,7 @@ using AIStudio.Tools;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 
-using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions;
+using DialogOptions = AIStudio.Dialogs.DialogOptions;
 
 namespace AIStudio.Components.Pages;
 
diff --git a/app/MindWork AI Studio/Components/Pages/Settings.razor.cs b/app/MindWork AI Studio/Components/Pages/Settings.razor.cs
index 1d72669b..aee842ac 100644
--- a/app/MindWork AI Studio/Components/Pages/Settings.razor.cs	
+++ b/app/MindWork AI Studio/Components/Pages/Settings.razor.cs	
@@ -1,11 +1,11 @@
-using AIStudio.Components.CommonDialogs;
+using AIStudio.Dialogs;
 using AIStudio.Provider;
 using AIStudio.Settings;
 using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-using DialogOptions = AIStudio.Components.CommonDialogs.DialogOptions;
+using DialogOptions = AIStudio.Dialogs.DialogOptions;
 
 // ReSharper disable ClassNeverInstantiated.Global
 
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor b/app/MindWork AI Studio/Dialogs/ConfirmDialog.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor
rename to app/MindWork AI Studio/Dialogs/ConfirmDialog.razor
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor.cs b/app/MindWork AI Studio/Dialogs/ConfirmDialog.razor.cs
similarity index 91%
rename from app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor.cs
rename to app/MindWork AI Studio/Dialogs/ConfirmDialog.razor.cs
index d75d6a8f..05fd6be9 100644
--- a/app/MindWork AI Studio/Components/CommonDialogs/ConfirmDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/ConfirmDialog.razor.cs	
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.CommonDialogs;
+namespace AIStudio.Dialogs;
 
 /// <summary>
 /// A confirmation dialog that can be used to ask the user for confirmation.
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/DialogOptions.cs b/app/MindWork AI Studio/Dialogs/DialogOptions.cs
similarity index 90%
rename from app/MindWork AI Studio/Components/CommonDialogs/DialogOptions.cs
rename to app/MindWork AI Studio/Dialogs/DialogOptions.cs
index 02a0e8c5..0f8e97f4 100644
--- a/app/MindWork AI Studio/Components/CommonDialogs/DialogOptions.cs	
+++ b/app/MindWork AI Studio/Dialogs/DialogOptions.cs	
@@ -1,4 +1,4 @@
-namespace AIStudio.Components.CommonDialogs;
+namespace AIStudio.Dialogs;
 
 public static class DialogOptions
 {
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor b/app/MindWork AI Studio/Dialogs/SingleInputDialog.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor
rename to app/MindWork AI Studio/Dialogs/SingleInputDialog.razor
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor.cs b/app/MindWork AI Studio/Dialogs/SingleInputDialog.razor.cs
similarity index 96%
rename from app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor.cs
rename to app/MindWork AI Studio/Dialogs/SingleInputDialog.razor.cs
index 7f350567..5b0e8e88 100644
--- a/app/MindWork AI Studio/Components/CommonDialogs/SingleInputDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/SingleInputDialog.razor.cs	
@@ -2,7 +2,7 @@ using AIStudio.Settings;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.CommonDialogs;
+namespace AIStudio.Dialogs;
 
 public partial class SingleInputDialog : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor
similarity index 95%
rename from app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor
rename to app/MindWork AI Studio/Dialogs/UpdateDialog.razor
index 80544496..f3551424 100644
--- a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor	
+++ b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor	
@@ -1,4 +1,3 @@
-@using AIStudio.Tools
 <MudDialog>
     <DialogContent>
         <MudText Typo="Typo.h4" Class="d-inline-flex align-center">
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor.cs b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor.cs
similarity index 94%
rename from app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor.cs
rename to app/MindWork AI Studio/Dialogs/UpdateDialog.razor.cs
index 340788d4..dccad89c 100644
--- a/app/MindWork AI Studio/Components/CommonDialogs/UpdateDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/UpdateDialog.razor.cs	
@@ -4,7 +4,7 @@ using AIStudio.Tools;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.CommonDialogs;
+namespace AIStudio.Dialogs;
 
 /// <summary>
 /// The update dialog that is used to inform the user about an available update.
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor b/app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor
similarity index 100%
rename from app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor
rename to app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor
diff --git a/app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor.cs b/app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor.cs
similarity index 97%
rename from app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor.cs
rename to app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor.cs
index b9582298..f123fc87 100644
--- a/app/MindWork AI Studio/Components/CommonDialogs/WorkspaceSelectionDialog.razor.cs	
+++ b/app/MindWork AI Studio/Dialogs/WorkspaceSelectionDialog.razor.cs	
@@ -4,7 +4,7 @@ using AIStudio.Settings;
 
 using Microsoft.AspNetCore.Components;
 
-namespace AIStudio.Components.CommonDialogs;
+namespace AIStudio.Dialogs;
 
 public partial class WorkspaceSelectionDialog : ComponentBase
 {
diff --git a/app/MindWork AI Studio/Dialogs/_Imports.razor b/app/MindWork AI Studio/Dialogs/_Imports.razor
new file mode 100644
index 00000000..702a7c45
--- /dev/null
+++ b/app/MindWork AI Studio/Dialogs/_Imports.razor	
@@ -0,0 +1,11 @@
+@using Microsoft.AspNetCore.Components.Forms
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Web
+@using static Microsoft.AspNetCore.Components.Web.RenderMode
+@using Microsoft.AspNetCore.Components.Web.Virtualization
+@using Microsoft.JSInterop
+@using AIStudio
+@using AIStudio.Tools
+@using AIStudio.Components
+@using AIStudio.Components.Blocks
+@using MudBlazor
\ No newline at end of file