diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
index 89983360ca..9c12b53d04 100644
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@ -137,7 +137,7 @@ add_executable(darkradiant
                ui/overlay/Overlay.cpp
                ui/overlay/OverlayDialog.cpp
                ui/particles/ParticleEditor.cpp
-               ui/particles/ParticlesChooser.cpp
+               ui/particles/ParticleChooserDialog.cpp
                ui/particles/ParticleSelector.cpp
                ui/patch/BulgePatchDialog.cpp
                ui/patch/CapDialog.cpp
diff --git a/radiant/ui/einspector/ModelPropertyEditor.cpp b/radiant/ui/einspector/ModelPropertyEditor.cpp
index 3ad7def0a0..bb5901b9ab 100644
--- a/radiant/ui/einspector/ModelPropertyEditor.cpp
+++ b/radiant/ui/einspector/ModelPropertyEditor.cpp
@@ -2,7 +2,7 @@
 #include "PropertyEditorFactory.h"
 
 #include "ui/modelselector/ModelSelector.h"
-#include "ui/particles/ParticlesChooser.h"
+#include "ui/particles/ParticleChooserDialog.h"
 
 #include "i18n.h"
 #include "ientity.h"
@@ -98,7 +98,7 @@ void ModelPropertyEditor::_onParticleButton(wxCommandEvent& ev)
 {
 	// Invoke ParticlesChooser
     std::string currentSelection = _entities.getSharedKeyValue(_key, true);
-	std::string particle = ParticlesChooser::ChooseParticle(currentSelection);
+	std::string particle = ParticleChooserDialog::ChooseParticle(currentSelection);
 
 	if (!particle.empty())
 	{
diff --git a/radiant/ui/ortho/OrthoContextMenu.cpp b/radiant/ui/ortho/OrthoContextMenu.cpp
index 25ed4f606c..588f299fe0 100644
--- a/radiant/ui/ortho/OrthoContextMenu.cpp
+++ b/radiant/ui/ortho/OrthoContextMenu.cpp
@@ -17,7 +17,7 @@
 
 #include "ui/modelselector/ModelSelector.h"
 #include "ui/prefabselector/PrefabSelector.h"
-#include "ui/particles/ParticlesChooser.h"
+#include "ui/particles/ParticleChooserDialog.h"
 
 #include "string/convert.h"
 #include "scene/GroupNodeChecker.h"
@@ -373,7 +373,7 @@ void OrthoContextMenu::callbackAddParticle()
     UndoableCommand command("addParticle");
 
     // Display the particle selector and block waiting for a selection (may be empty)
-    auto selectedParticle = ParticlesChooser::ChooseParticle();
+    auto selectedParticle = ParticleChooserDialog::ChooseParticle();
 
     if (selectedParticle.empty()) return;
 
diff --git a/radiant/ui/particles/ParticlesChooser.cpp b/radiant/ui/particles/ParticleChooserDialog.cpp
similarity index 66%
rename from radiant/ui/particles/ParticlesChooser.cpp
rename to radiant/ui/particles/ParticleChooserDialog.cpp
index 6e569ca77f..a91653913a 100644
--- a/radiant/ui/particles/ParticlesChooser.cpp
+++ b/radiant/ui/particles/ParticleChooserDialog.cpp
@@ -1,4 +1,4 @@
-#include "ParticlesChooser.h"
+#include "ParticleChooserDialog.h"
 
 #include "i18n.h"
 
@@ -10,7 +10,7 @@
 namespace ui
 {
 
-ParticlesChooser::ParticlesChooser() :
+ParticleChooserDialog::ParticleChooserDialog() :
 	DialogBase(_("Choose Particle")),
     _selector(new ParticleSelector(this))
 {
@@ -21,17 +21,17 @@ ParticlesChooser::ParticlesChooser() :
 
 	FitToScreen(0.5f, 0.6f);
 
-    _selector->Bind(wxEVT_DATAVIEW_ITEM_ACTIVATED, &ParticlesChooser::_onItemActivated, this);
+    _selector->Bind(wxEVT_DATAVIEW_ITEM_ACTIVATED, &ParticleChooserDialog::_onItemActivated, this);
 }
 
-void ParticlesChooser::_onItemActivated(wxDataViewEvent& ev)
+void ParticleChooserDialog::_onItemActivated(wxDataViewEvent& ev)
 {
     EndModal(wxID_OK);
 }
 
-std::string ParticlesChooser::ChooseParticle(const std::string& current)
+std::string ParticleChooserDialog::ChooseParticle(const std::string& current)
 {
-    auto* dialog = new ParticlesChooser();
+    auto* dialog = new ParticleChooserDialog();
 	
 	dialog->_selector->setSelectedParticle(current);
 
diff --git a/radiant/ui/particles/ParticlesChooser.h b/radiant/ui/particles/ParticleChooserDialog.h
similarity index 89%
rename from radiant/ui/particles/ParticlesChooser.h
rename to radiant/ui/particles/ParticleChooserDialog.h
index e74ed9da1f..dd1085be14 100644
--- a/radiant/ui/particles/ParticlesChooser.h
+++ b/radiant/ui/particles/ParticleChooserDialog.h
@@ -17,7 +17,7 @@ namespace ui
  * \brief
  * Chooser dialog for selection and preview of particle systems.
  */
-class ParticlesChooser : 
+class ParticleChooserDialog : 
 	public wxutil::DialogBase,
     public sigc::trackable
 {
@@ -26,14 +26,14 @@ class ParticlesChooser :
 
 private:
 	// Constructor creates elements
-	ParticlesChooser();
+	ParticleChooserDialog();
 
     void _onItemActivated( wxDataViewEvent& ev );
 
 public:
 
 	/**
-	 * Display the singleton dialog and return the name of the selected
+	 * Display the dialog and return the name of the selected
 	 * particle system, or the empty string if none was selected.
 	 *
 	 * @param currentParticle
diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
index 186e6c9040..295f70438e 100644
--- a/tools/msvc/DarkRadiant.vcxproj
+++ b/tools/msvc/DarkRadiant.vcxproj
@@ -324,8 +324,8 @@
     <ClCompile Include="..\..\radiant\ui\ortho\OrthoContextMenu.cpp" />
     <ClCompile Include="..\..\radiant\ui\overlay\Overlay.cpp" />
     <ClCompile Include="..\..\radiant\ui\overlay\OverlayDialog.cpp" />
+    <ClCompile Include="..\..\radiant\ui\particles\ParticleChooserDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\particles\ParticleEditor.cpp" />
-    <ClCompile Include="..\..\radiant\ui\particles\ParticlesChooser.cpp" />
     <ClCompile Include="..\..\radiant\ui\particles\ParticleSelector.cpp" />
     <ClCompile Include="..\..\radiant\ui\patch\BulgePatchDialog.cpp" />
     <ClCompile Include="..\..\radiant\ui\patch\CapDialog.cpp" />
@@ -540,9 +540,9 @@
     <ClInclude Include="..\..\radiant\ui\overlay\Overlay.h" />
     <ClInclude Include="..\..\radiant\ui\overlay\OverlayDialog.h" />
     <ClInclude Include="..\..\radiant\ui\overlay\OverlayRegistryKeys.h" />
+    <ClInclude Include="..\..\radiant\ui\particles\ParticleChooserDialog.h" />
     <ClInclude Include="..\..\radiant\ui\particles\ParticleEditor.h" />
     <ClInclude Include="..\..\radiant\ui\particles\ThreadedParticlesLoader.h" />
-    <ClInclude Include="..\..\radiant\ui\particles\ParticlesChooser.h" />
     <ClInclude Include="..\..\radiant\ui\particles\ParticleSelector.h" />
     <ClInclude Include="..\..\radiant\ui\patch\BulgePatchDialog.h" />
     <ClInclude Include="..\..\radiant\ui\patch\CapDialog.h" />
diff --git a/tools/msvc/DarkRadiant.vcxproj.filters b/tools/msvc/DarkRadiant.vcxproj.filters
index 904943ef28..482f15db80 100644
--- a/tools/msvc/DarkRadiant.vcxproj.filters
+++ b/tools/msvc/DarkRadiant.vcxproj.filters
@@ -316,9 +316,6 @@
     <ClCompile Include="..\..\radiant\ui\overlay\OverlayDialog.cpp">
       <Filter>src\ui\overlay</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\radiant\ui\particles\ParticlesChooser.cpp">
-      <Filter>src\ui\particles</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\radiant\ui\patch\BulgePatchDialog.cpp">
       <Filter>src\ui\patch</Filter>
     </ClCompile>
@@ -715,6 +712,9 @@
     <ClCompile Include="..\..\radiant\ui\particles\ParticleSelector.cpp">
       <Filter>src\ui\particles</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\radiant\ui\particles\ParticleChooserDialog.cpp">
+      <Filter>src\ui\particles</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\radiant\camera\CameraSettings.h">
@@ -852,9 +852,6 @@
     <ClInclude Include="..\..\radiant\ui\overlay\OverlayRegistryKeys.h">
       <Filter>src\ui\overlay</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\radiant\ui\particles\ParticlesChooser.h">
-      <Filter>src\ui\particles</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\radiant\ui\patch\BulgePatchDialog.h">
       <Filter>src\ui\patch</Filter>
     </ClInclude>
@@ -1392,6 +1389,9 @@
     <ClInclude Include="..\..\radiant\ui\particles\ThreadedParticlesLoader.h">
       <Filter>src\ui\particles</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\radiant\ui\particles\ParticleChooserDialog.h">
+      <Filter>src\ui\particles</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\radiant\darkradiant.rc" />