diff --git a/gui/characterEditor.py b/gui/characterEditor.py
index 8fa9a23b2..0fe9b37f6 100644
--- a/gui/characterEditor.py
+++ b/gui/characterEditor.py
@@ -127,7 +127,7 @@ class CharacterEditor(wx.Dialog):
         self.btnSaveChar.Bind(wx.EVT_BUTTON, self.saveChar)
         self.btnSaveAs.Bind(wx.EVT_BUTTON, self.saveCharAs)
         self.btnRevert.Bind(wx.EVT_BUTTON, self.revertChar)
-        self.btnOK.Bind(wx.EVT_BUTTON, self.OnClose)
+        self.btnOK.Bind(wx.EVT_BUTTON, self.editingFinished)
 
         mainSizer.Add(bSizerButtons, 0, wx.EXPAND, 5)
 
@@ -167,6 +167,10 @@ class CharacterEditor(wx.Dialog):
 
         self.btnRestrict()
 
+    def editingFinished(self, event):
+        wx.PostEvent(self.mainFrame, GE.CharListUpdated())
+        self.Close()
+
     def registerEvents(self):
         self.Bind(wx.EVT_CLOSE, self.OnClose)
         self.Bind(GE.CHAR_LIST_UPDATED, self.refreshCharacterList)
@@ -315,7 +319,7 @@ class CharacterEditor(wx.Dialog):
             sFit.clearFit(fitID)
             wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
-        event.Skip()
+        self.Destroy()
 
 class SkillTreeView (wx.Panel):
     def __init__(self, parent):
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 93c92dc86..040872d64 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -351,7 +351,6 @@ class MainFrame(wx.Frame):
     def showCharacterEditor(self, event):
         dlg=CharacterEditor(self)
         dlg.ShowModal()
-        dlg.Destroy()
 
     def showAttrEditor(self, event):
         dlg=AttributeEditor(self)