diff --git a/Configuration.ui b/Configuration.ui
index ba467b976..85aa7d207 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -2342,7 +2342,7 @@ Right click for insert and delete options.</string>
              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Exchange 4-character grid locators instead of reports. See User Guide for details.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>FT8 and MSK144 Contest Mode</string>
+             <string>FT8 and MSK144:  NA VHF Contest Mode</string>
             </property>
            </widget>
           </item>
@@ -2634,12 +2634,12 @@ soundcard changes</string>
   </connection>
  </connections>
  <buttongroups>
-  <buttongroup name="CAT_data_bits_button_group"/>
   <buttongroup name="split_mode_button_group"/>
+  <buttongroup name="TX_audio_source_button_group"/>
+  <buttongroup name="CAT_stop_bits_button_group"/>
+  <buttongroup name="TX_mode_button_group"/>
+  <buttongroup name="CAT_data_bits_button_group"/>
   <buttongroup name="CAT_handshake_button_group"/>
   <buttongroup name="PTT_method_button_group"/>
-  <buttongroup name="CAT_stop_bits_button_group"/>
-  <buttongroup name="TX_audio_source_button_group"/>
-  <buttongroup name="TX_mode_button_group"/>
  </buttongroups>
 </ui>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2e1498520..43b343cda 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3796,8 +3796,8 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
             }
             m_QSOProgress = SIGNOFF;
           } else if((m_QSOProgress >= REPORT
-                     || (m_QSOProgress >= REPLYING && "MSK144" == m_mode && m_config.contestMode ()))
-                    && r.mid(0,1)=="R") {
+                     || (m_QSOProgress >= REPLYING && (m_mode=="MSK144" or m_mode=="FT8")
+                         && m_config.contestMode ())) && r.mid(0,1)=="R") {
             m_ntx=4;
             m_QSOProgress = ROGERS;
             ui->txrb4->setChecked(true);
@@ -3836,8 +3836,8 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
       }
       else if (!(m_bAutoReply && m_QSOProgress > CALLING)) {
         if ((t4.size () >= 9 && t4.at (5).contains (m_baseCall) && t4.at (8) == "OOO")
-            || (m_mode=="MSK144" && m_config.contestMode())) {
-          // EME short code report or MSK144 contest mode reply, send back Tx3
+            || ((m_mode=="MSK144" or m_mode=="FT8") && m_config.contestMode())) {
+          // EME short code report or MSK144/FT8 contest mode reply, send back Tx3
           m_ntx = 3;
           m_QSOProgress = ROGER_REPORT;
           ui->txrb3->setChecked (true);