diff --git a/radiantcore/selection/shaderclipboard/ShaderClipboard.cpp b/radiantcore/selection/shaderclipboard/ShaderClipboard.cpp
index 27df70a76e..ee1f86746b 100644
--- a/radiantcore/selection/shaderclipboard/ShaderClipboard.cpp
+++ b/radiantcore/selection/shaderclipboard/ShaderClipboard.cpp
@@ -4,6 +4,7 @@
 #include "imap.h"
 #include "iselectiontest.h"
 #include "iscenegraph.h"
+#include "iclipboard.h"
 #include "ClosestTexturableFinder.h"
 
 #include "util/ScopedBoolLock.h"
@@ -93,6 +94,12 @@ void ShaderClipboard::pickFromSelectionTest(SelectionTest& test)
 
 	_source = getTexturable(test);
 
+    // Copy the material name to the system clipboard when picking
+    if (!_source.empty() && module::GlobalModuleRegistry().moduleExists(MODULE_CLIPBOARD))
+    {
+        GlobalClipboard().setString(_source.getShader());
+    }
+
 	sourceChanged();
 }