diff --git a/wxPython/wxPython/tools/XRCed/panel.py b/wxPython/wxPython/tools/XRCed/panel.py
index 5202ccb237..96a773702d 100644
--- a/wxPython/wxPython/tools/XRCed/panel.py
+++ b/wxPython/wxPython/tools/XRCed/panel.py
@@ -161,6 +161,7 @@ class ParamPage(wxPanel):
         xxx = self.xxx
         param = evt.GetEventObject().GetName()
         w = self.controls[param]
+        w.Enable(true)
         objElem = xxx.element
         if evt.IsChecked():
             # Ad  new text node in order of allParams
@@ -193,7 +194,7 @@ class ParamPage(wxPanel):
             del xxx.params[param]
             w.SetValue('')
             w.modified = false          # mark as not changed
-        w.Enable(evt.IsChecked())
+            w.Enable(false)
         # Set modified flag (provokes undo storing is necessary)
         panel.SetModified(true)
     def Apply(self):
diff --git a/wxPython/wxPython/tools/XRCed/params.py b/wxPython/wxPython/tools/XRCed/params.py
index 986c94ad3f..f983748bec 100644
--- a/wxPython/wxPython/tools/XRCed/params.py
+++ b/wxPython/wxPython/tools/XRCed/params.py
@@ -711,19 +711,21 @@ class ParamBitmap(PPanel):
         EVT_TEXT(self, XMLID('TEXT_FILE'), self.OnChange)
     def OnRadioStd(self, evt):
         self.SetModified()
-        self.SetValue('')
+        self.SetValue(['wxART_MISSING_IMAGE',''])
     def OnRadioFile(self, evt):
         self.SetModified()
         self.SetValue(['',''])
     def updateRadios(self):
         if self.value[0]:
+            self.radio_std.SetValue(true)
             self.text.Enable(false)
             self.button.Enable(false)
             self.combo.Enable(true)
         else:
+            self.radio_file.SetValue(true)
             self.text.Enable(true)
             self.button.Enable(true)
-            self.combo.Enable(false)            
+            self.combo.Enable(false)
     def OnChange(self, evt):
         PPanel.OnChange(self, evt)
         self.textModified = true
@@ -737,7 +739,7 @@ class ParamBitmap(PPanel):
     def SetValue(self, value):
         self.freeze = true
         if not value:
-            self.value = ['wxART_MISSING_IMAGE', '']
+            self.value = ['', '']
         else:
             self.value = value
         self.combo.SetValue(self.value[0])