diff --git a/gui/griffon-app/lifecycle/Initialize.groovy b/gui/griffon-app/lifecycle/Initialize.groovy
index 0c7f0ea7..cf872e8f 100644
--- a/gui/griffon-app/lifecycle/Initialize.groovy
+++ b/gui/griffon-app/lifecycle/Initialize.groovy
@@ -75,11 +75,12 @@ class Initialize extends AbstractLifecycleHandler {
                 })
                 
                 def showMW = {e ->
-                def mainFrame = application.getWindowManager().findWindow("main-frame")
-                if (mainFrame != null)
-                    Core core = application.getContext().findWindow("main-frame")
-                    if (core != null)
-                        mainFrame.setVisible(true)
+                    def mainFrame = application.getWindowManager().findWindow("main-frame")
+                    if (mainFrame != null) {
+                        Core core = application.getContext().get("core")
+                        if (core != null)
+                            mainFrame.setVisible(true)
+                    }
                 }
 
                 def show = new MenuItem("Open MuWire")