diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 8b3eee6a1..43421a57b 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -97,7 +97,7 @@ CMakeSetupDialog::CMakeSetupDialog()
   this->GenerateAction = ToolsMenu->addAction(tr("&Generate"));
   QObject::connect(this->GenerateAction, SIGNAL(triggered(bool)), 
                    this, SLOT(doGenerate()));
-#if defined(__APPLE__)
+#if defined(Q_WS_MAC)
   this->InstallForCommandLineAction 
     = ToolsMenu->addAction(tr("&Install For Command Line Use"));
   QObject::connect(this->InstallForCommandLineAction, SIGNAL(triggered(bool)), 
@@ -807,7 +807,7 @@ void CMakeSetupDialog::enterState(CMakeSetupDialog::State s)
     this->setEnabledState(false);
     this->GenerateButton->setEnabled(false);
     this->GenerateAction->setEnabled(false);
-    this->ConfigureButton->setText(tr("Stop"));
+    this->ConfigureButton->setText(tr("&Stop"));
     }
   else if(s == Generating)
     {
@@ -815,7 +815,7 @@ void CMakeSetupDialog::enterState(CMakeSetupDialog::State s)
     this->setEnabledState(false);
     this->ConfigureButton->setEnabled(false);
     this->GenerateAction->setEnabled(false);
-    this->GenerateButton->setText(tr("Stop"));
+    this->GenerateButton->setText(tr("&Stop"));
     }
   else if(s == ReadyConfigure)
     {
@@ -824,8 +824,8 @@ void CMakeSetupDialog::enterState(CMakeSetupDialog::State s)
     this->GenerateButton->setEnabled(false);
     this->GenerateAction->setEnabled(false);
     this->ConfigureButton->setEnabled(true);
-    this->ConfigureButton->setText(tr("Configure"));
-    this->GenerateButton->setText(tr("Generate"));
+    this->ConfigureButton->setText(tr("&Configure"));
+    this->GenerateButton->setText(tr("&Generate"));
     }
   else if(s == ReadyGenerate)
     {
@@ -834,8 +834,8 @@ void CMakeSetupDialog::enterState(CMakeSetupDialog::State s)
     this->GenerateButton->setEnabled(true);
     this->GenerateAction->setEnabled(true);
     this->ConfigureButton->setEnabled(true);
-    this->ConfigureButton->setText(tr("Configure"));
-    this->GenerateButton->setText(tr("Generate"));
+    this->ConfigureButton->setText(tr("&Configure"));
+    this->GenerateButton->setText(tr("&Generate"));
     }
 }
 
diff --git a/Source/QtDialog/CMakeSetupDialog.ui b/Source/QtDialog/CMakeSetupDialog.ui
index fb80cc021..035045da7 100644
--- a/Source/QtDialog/CMakeSetupDialog.ui
+++ b/Source/QtDialog/CMakeSetupDialog.ui
@@ -37,7 +37,7 @@
      <item row="0" column="2" >
       <widget class="QPushButton" name="BrowseSourceDirectoryButton" >
        <property name="text" >
-        <string>Browse...</string>
+        <string>Browse &amp;Source...</string>
        </property>
       </widget>
      </item>
@@ -66,7 +66,7 @@
      <item row="1" column="2" >
       <widget class="QPushButton" name="BrowseBinaryDirectoryButton" >
        <property name="text" >
-        <string>Browse...</string>
+        <string>Browse &amp;Build...</string>
        </property>
       </widget>
      </item>
@@ -155,7 +155,7 @@
             <string>Add New Entry</string>
            </property>
            <property name="text" >
-            <string>Add Entry</string>
+            <string>&amp;Add Entry</string>
            </property>
            <property name="icon" >
             <iconset resource="CMakeSetup.qrc" >:/Icons/Plus16.png</iconset>
@@ -171,7 +171,7 @@
             <string>Remove Selected Entries</string>
            </property>
            <property name="text" >
-            <string>Remove Entry</string>
+            <string>&amp;Remove Entry</string>
            </property>
            <property name="icon" >
             <iconset resource="CMakeSetup.qrc" >:/Icons/Delete16.png</iconset>
@@ -220,14 +220,14 @@
          <item>
           <widget class="QPushButton" name="ConfigureButton" >
            <property name="text" >
-            <string>Configure</string>
+            <string>&amp;Configure</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="GenerateButton" >
            <property name="text" >
-            <string>Generate</string>
+            <string>&amp;Generate</string>
            </property>
           </widget>
          </item>