diff --git a/eID_gui/src/change-pin.desktop.in b/eID_gui/src/change-pin.desktop.in
index ac9228e..5e020f8 100644
--- a/eID_gui/src/change-pin.desktop.in
+++ b/eID_gui/src/change-pin.desktop.in
@@ -3,7 +3,7 @@ Version=@VERSION@
 Encoding=UTF-8
 Name=PIN ändern
 Comment=GUI zum Ändern der eID-PIN
-Exec=eid_gui.py
+Exec=change-pin.py
 Icon=@prefix@/share/eid_gui/images/OpenPACElogo.png
 Terminal=false
 Type=Application
diff --git a/eID_gui/src/eid/widgets.py b/eID_gui/src/eid/widgets.py
index ac48fdc..834bfe7 100644
--- a/eID_gui/src/eid/widgets.py
+++ b/eID_gui/src/eid/widgets.py
@@ -7,6 +7,7 @@ except ImportError:
     sys.exit(1)
 
 from eid_gui_globals import AT_CHAT_STRINGS, IMAGES
+from windows import MsgBox
 
 class customCheckButton(object):
     """This class provides a custom version of gtk.CheckButton.
@@ -60,6 +61,5 @@ class customCheckButton(object):
     def _show_info(self, widget=None, data=None):
         """Show a messagebox containing info about the access right in
            question"""
-        help = MsgBox(self.parent, self.helptext, "info",
-                gtk.DIALOG_DESTROY_WITH_PARENT)
+        help = MsgBox(self.parent, self.helptext, "info")