diff --git a/gui/dialogs/button-config.xml b/gui/dialogs/button-config.xml
index 81d6fb19f..cdd8a2021 100644
--- a/gui/dialogs/button-config.xml
+++ b/gui/dialogs/button-config.xml
@@ -56,7 +56,7 @@ var assignButton = func(cmd) {
 	
 	<text>
 	  <halign>left</halign>
-	  <label>Select the command you wish to assign to this button</label>
+	  <label>Select the command you wish to assign to this button.</label>
   </text>
   
   <hrule/>
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 912669d71..2d074f404 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -737,10 +737,10 @@
 		</item>
 
 		<item>
-			<name>joystick-info</name>
+			<name>joystick-config</name>
 			<binding>
 				<command>dialog-show</command>
-				<dialog-name>joystick-info</dialog-name>
+				<dialog-name>joystick-config</dialog-name>
 			</binding>
 		</item>