diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
index 68c5611d09..cb8439a897 100644
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@ -48,6 +48,8 @@ add_executable(darkradiant
                ui/common/ShaderSelector.cpp
                ui/common/SoundShaderDefinitionView.cpp
                ui/common/TexturePreviewCombo.cpp
+               ui/common/SoundChooser.cpp
+               ui/common/SoundShaderPreview.cpp
                ui/DispatchEvent.cpp
                ui/Documentation.cpp
                ui/eclasstree/EClassTreeBuilder.cpp
@@ -111,8 +113,6 @@ add_executable(darkradiant
                ui/menu/MenuItem.cpp
                ui/menu/MenuManager.cpp
                ui/menu/MenuSeparator.cpp
-               uimanager/SoundChooser.cpp
-               uimanager/SoundShaderPreview.cpp
                ui/toolbar/ToolbarManager.cpp
                ui/MapCommands.cpp
                ui/MapFileProgressHandler.cpp
diff --git a/radiant/ui/common/DialogManager.cpp b/radiant/ui/common/DialogManager.cpp
index 60caec45fa..5e666d1e52 100644
--- a/radiant/ui/common/DialogManager.cpp
+++ b/radiant/ui/common/DialogManager.cpp
@@ -6,7 +6,7 @@
 #include "wxutil/dialog/MessageBox.h"
 #include "wxutil/FileChooser.h"
 #include "wxutil/DirChooser.h"
-#include "uimanager/SoundChooser.h"
+#include "ui/common/SoundChooser.h"
 #include "ui/animationpreview/MD5AnimationChooser.h"
 #include "module/StaticModule.h"
 
diff --git a/radiant/uimanager/SoundChooser.cpp b/radiant/ui/common/SoundChooser.cpp
similarity index 100%
rename from radiant/uimanager/SoundChooser.cpp
rename to radiant/ui/common/SoundChooser.cpp
diff --git a/radiant/uimanager/SoundChooser.h b/radiant/ui/common/SoundChooser.h
similarity index 100%
rename from radiant/uimanager/SoundChooser.h
rename to radiant/ui/common/SoundChooser.h
diff --git a/radiant/uimanager/SoundShaderPreview.cpp b/radiant/ui/common/SoundShaderPreview.cpp
similarity index 100%
rename from radiant/uimanager/SoundShaderPreview.cpp
rename to radiant/ui/common/SoundShaderPreview.cpp
diff --git a/radiant/uimanager/SoundShaderPreview.h b/radiant/ui/common/SoundShaderPreview.h
similarity index 100%
rename from radiant/uimanager/SoundShaderPreview.h
rename to radiant/ui/common/SoundShaderPreview.h
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index 08a79cea82..8d25976ed5 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -223,8 +223,6 @@
     <ClCompile Include="..\..\radiant\settings\LocalisationModule.cpp" />
     <ClCompile Include="..\..\radiant\settings\LocalisationProvider.cpp" />
     <ClCompile Include="..\..\radiant\settings\Win32Registry.cpp" />
-    <ClCompile Include="..\..\radiant\uimanager\SoundChooser.cpp" />
-    <ClCompile Include="..\..\radiant\uimanager\SoundShaderPreview.cpp" />
     <ClCompile Include="..\..\radiant\ui\aas\AasControl.cpp" />
     <ClCompile Include="..\..\radiant\ui\aas\AasControlDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\aas\RenderableAasFile.cpp" />
@@ -236,7 +234,9 @@
     <ClCompile Include="..\..\radiant\ui\common\DefinitionView.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\DialogManager.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\MaterialDefinitionView.cpp" />
+    <ClCompile Include="..\..\radiant\ui\common\SoundChooser.cpp" />
     <ClCompile Include="..\..\radiant\ui\common\SoundShaderDefinitionView.cpp" />
+    <ClCompile Include="..\..\radiant\ui\common\SoundShaderPreview.cpp" />
     <ClCompile Include="..\..\radiant\ui\DispatchEvent.cpp" />
     <ClCompile Include="..\..\radiant\ui\Documentation.cpp" />
     <ClCompile Include="..\..\radiant\ui\eclasstree\EClassTree.cpp" />
@@ -405,8 +405,6 @@
     <ClInclude Include="..\..\radiant\settings\LocalisationModule.h" />
     <ClInclude Include="..\..\radiant\settings\LocalisationProvider.h" />
     <ClInclude Include="..\..\radiant\settings\Win32Registry.h" />
-    <ClInclude Include="..\..\radiant\uimanager\SoundChooser.h" />
-    <ClInclude Include="..\..\radiant\uimanager\SoundShaderPreview.h" />
     <ClInclude Include="..\..\radiant\ui\aas\AasControl.h" />
     <ClInclude Include="..\..\radiant\ui\aas\AasControlDialog.h" />
     <ClInclude Include="..\..\radiant\ui\aas\RenderableAasFile.h" />
@@ -419,7 +417,9 @@
     <ClInclude Include="..\..\radiant\ui\common\DefinitionView.h" />
     <ClInclude Include="..\..\radiant\ui\common\DialogManager.h" />
     <ClInclude Include="..\..\radiant\ui\common\MaterialDefinitionView.h" />
+    <ClInclude Include="..\..\radiant\ui\common\SoundChooser.h" />
     <ClInclude Include="..\..\radiant\ui\common\SoundShaderDefinitionView.h" />
+    <ClInclude Include="..\..\radiant\ui\common\SoundShaderPreview.h" />
     <ClInclude Include="..\..\radiant\ui\DispatchEvent.h" />
     <ClInclude Include="..\..\radiant\ui\Documentation.h" />
     <ClInclude Include="..\..\radiant\ui\eclasstree\EClassTree.h" />
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index 01ee09a0d6..2fc72c8235 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -125,9 +125,6 @@
     <Filter Include="src\ui\entitylist">
       <UniqueIdentifier>{cf31bdd4-5049-41b1-bfe6-fafd3b1e8692}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\uimanager">
-      <UniqueIdentifier>{9447d2a6-4742-4c6b-b53c-cd25985c034e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="src\eventmanager">
       <UniqueIdentifier>{9215c909-e37e-4fef-b0ce-04455bf61cf2}</UniqueIdentifier>
     </Filter>
@@ -490,12 +487,6 @@
     <ClCompile Include="..\..\radiant\ui\entitylist\GraphTreeModel.cpp">
       <Filter>src\ui\entitylist</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\uimanager\SoundChooser.cpp">
-      <Filter>src\uimanager</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\radiant\uimanager\SoundShaderPreview.cpp">
-      <Filter>src\uimanager</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\eventmanager\Accelerator.cpp">
       <Filter>src\eventmanager</Filter>
     </ClCompile>
@@ -688,6 +679,12 @@
     <ClCompile Include="..\..\radiant\ui\common\DialogManager.cpp">
       <Filter>src\ui\common</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\common\SoundChooser.cpp">
+      <Filter>src\ui\common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\common\SoundShaderPreview.cpp">
+      <Filter>src\ui\common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -1068,12 +1065,6 @@
     <ClInclude Include="..\..\radiant\ui\entitylist\GraphTreeNode.h">
       <Filter>src\ui\entitylist</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\uimanager\SoundChooser.h">
-      <Filter>src\uimanager</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\radiant\uimanager\SoundShaderPreview.h">
-      <Filter>src\uimanager</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\eventmanager\Accelerator.h">
       <Filter>src\eventmanager</Filter>
     </ClInclude>
@@ -1314,6 +1305,12 @@
     <ClInclude Include="..\..\radiant\ui\common\DialogManager.h">
       <Filter>src\ui\common</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\common\SoundChooser.h">
+      <Filter>src\ui\common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\common\SoundShaderPreview.h">
+      <Filter>src\ui\common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />