diff --git a/radiant/ui/skin/SkinEditor.cpp b/radiant/ui/skin/SkinEditor.cpp
index 1e64e6e5a..5b7a9883d 100644
--- a/radiant/ui/skin/SkinEditor.cpp
+++ b/radiant/ui/skin/SkinEditor.cpp
@@ -235,18 +235,20 @@ void SkinEditor::setupRemappingPanel()
 
 void SkinEditor::chooseRemappedSourceMaterial()
 {
-    MaterialChooser chooser(
-        this, MaterialSelector::TextureFilter::All, _sourceMaterialEdit
-    );
-    chooser.ShowModal();
+    MaterialChooser chooser(this, MaterialSelector::TextureFilter::All);
+    if (chooser.ShowModal() == wxID_OK) {
+        _sourceMaterialEdit->SetValue(chooser.GetSelectedDeclName());
+    }
 }
 
 void SkinEditor::chooseRemappedDestMaterial()
 {
-    MaterialChooser chooser(
-        this, MaterialSelector::TextureFilter::All, _replacementMaterialEdit
-    );
-    chooser.ShowModal();
+    MaterialChooser chooser(this, MaterialSelector::TextureFilter::All);
+    if (chooser.ShowModal() == wxID_OK) {
+        const std::string materialName = chooser.GetSelectedDeclName();
+        _replacementMaterialEdit->SetValue(materialName);
+        onReplacementEntryChanged(materialName);
+    }
 }
 
 decl::ISkin::Ptr SkinEditor::getSelectedSkin()