diff --git a/gui/builtinContextMenus/damagePattern.py b/gui/builtinContextMenus/damagePattern.py
index 3bb0ad4fe..5d358d9a8 100755
--- a/gui/builtinContextMenus/damagePattern.py
+++ b/gui/builtinContextMenus/damagePattern.py
@@ -16,7 +16,6 @@ class DamagePattern(ContextMenu):
         return map(lambda p: p.name, sDP.getDamagePatternList())
 
     def activate(self, context, selection, i):
-        dlg=DmgPatternEditorDlg(self.mainFrame)
-        dlg.ShowModal()
-        dlg.Destroy()
+        pass
+
 DamagePattern.register()
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index d1675ad7c..db4c169e7 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -29,6 +29,7 @@ from gui.shipBrowser import ShipBrowser
 from wx.lib.wordwrap import wordwrap
 from gui.characterEditor import CharacterEditor
 from gui.characterSelection import CharacterSelection
+from gui.patternEditor import DmgPatternEditorDlg
 import aboutData
 import gui.fittingView as fv
 from wx._core import PyDeadObjectError
@@ -132,6 +133,11 @@ class MainFrame(wx.Frame):
         cFit.clearFit(self.getActiveFit())
         wx.PostEvent(self, fv.FitChanged(fitID=self.getActiveFit()))
 
+    def showDamagePatternEditor(self, event):
+        dlg=DmgPatternEditorDlg(self)
+        dlg.ShowModal()
+        dlg.Destroy()
+
     def registerMenu(self):
         # Quit
         self.Bind(wx.EVT_MENU, self.ExitApp, id=wx.ID_EXIT)
@@ -141,6 +147,8 @@ class MainFrame(wx.Frame):
         self.Bind(wx.EVT_MENU, self.ShowAboutBox, id=wx.ID_ABOUT)
         # Char editor
         self.Bind(wx.EVT_MENU, self.showCharacterEditor, id=self.GetMenuBar().characterEditorId)
+        # Damage pattern editor
+        self.Bind(wx.EVT_MENU, self.showDamagePatternEditor, id=self.GetMenuBar().damagePatternEditorId)
 
     def toggleShipBrowser(self, event):
         self.GetToolBar().toggleShipBrowser(event)
diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index f6b9439a8..e9df54c30 100644
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -48,7 +48,7 @@ class MainMenuBar(wx.MenuBar):
 
         # Character menu
         windowMenu = wx.Menu()
-        self.Append(windowMenu, "&Windows")
+        self.Append(windowMenu, "&Window")
 
         charEditItem = wx.MenuItem(windowMenu, self.characterEditorId, "&Character Editor\tCTRL+E")
         charEditItem.SetBitmap(bitmapLoader.getBitmap("character_small", "icons"))