diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index b82430a11..faba65863 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3303,7 +3303,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
     <td><b>Click</b> to set Rx frequency.<br/>
         <b>Shift-click</b> to set Tx frequency.<br/>
         <b>Ctrl-click</b> or <b>Right-click</b> to set Rx and Tx frequencies.<br/>
-        <b>Double-click</b> to also decode at Rx frequency.<br/>
+        <b>Double-click</b> to also decode at Rx frequency.
     </td>
   </tr>
   <tr>
@@ -3314,7 +3314,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
         messages.<br/>
         If <b>Hold Tx Freq</b> is checked or first callsign in message<br/>
         is your own call, Tx frequency is not changed unless <br/>
-        <b>Ctrl</b> is held down.<br/>
+        <b>Ctrl</b> is held down.
     </td>
   </tr>
   <tr>
@@ -3323,6 +3323,18 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
         <b>Double-click</b> to erase QSO and Band Activity windows.
     </td>
   </tr>
+  <tr>
+    <td align="right">Q65 Button:</td>
+    <td><b>Click</b> to switch to Q65 Mode.<br/>
+        <b>Right-click</b> to switch to Q65 Pileup Mode.
+    </td>
+  </tr>
+  <tr>
+    <td align="right">JT65 Button:</td>
+    <td><b>Click</b> to switch to JT65 Mode.<br/>
+        <b>Right-click</b> to switch to JT9 Mode.
+    </td>
+  </tr>
 </table>)"), font});
     }
   m_mouseCmnds->showNormal ();
@@ -6601,18 +6613,14 @@ void MainWindow::on_RoundRobin_currentTextChanged(QString text)
 
 void MainWindow::mousePressEvent(QMouseEvent *event)
 {
-  if(ui->q65Button->hasFocus() && (event->button() & Qt::RightButton)) {
-      m_specOp=m_config.special_op_id();
-      if (m_specOp==SpecOp::Q65_PILEUP) {
-          m_config.setSpecial_None();
-          ui->tx1->setEnabled(true);
-          ui->txb1->setEnabled(true);
-      } else {
-          m_config.setSpecial_Q65_Pileup();
-      }
+  if(ui->q65Button->hasFocus() && (event->button() & Qt::RightButton)) {     // switch to Q65_Pileup mode
+      m_config.setSpecial_Q65_Pileup();
       m_specOp=m_config.special_op_id();
       on_actionQ65_triggered();
   }
+  if(ui->jt65Button->hasFocus() && (event->button() & Qt::RightButton)) {    // switch to JT9 mode
+      on_actionJT9_triggered();
+  }
 }
 
 void MainWindow::on_dxCallEntry_textChanged (QString const& call)
@@ -10776,29 +10784,33 @@ void MainWindow::on_houndButton_clicked (bool checked)
 
 void MainWindow::on_ft8Button_clicked()
 {
-  if(m_specOp==SpecOp::HOUND) {
+  if (m_specOp==SpecOp::HOUND) {
     m_config.setSpecial_None();
     m_specOp=m_config.special_op_id();
   }
-    on_actionFT8_triggered();
+  on_actionFT8_triggered();
 }
 
 void MainWindow::on_ft4Button_clicked()
 {
-    on_actionFT4_triggered();
+  on_actionFT4_triggered();
 }
 
 void MainWindow::on_msk144Button_clicked()
 {
-    on_actionMSK144_triggered();
+  on_actionMSK144_triggered();
 }
 
 void MainWindow::on_q65Button_clicked()
 {
-    on_actionQ65_triggered();
+  if (m_specOp==SpecOp::Q65_PILEUP) {
+    m_config.setSpecial_None();
+    m_specOp=m_config.special_op_id();
+  }
+  on_actionQ65_triggered();
 }
 
 void MainWindow::on_jt65Button_clicked()
 {
-    on_actionJT65_triggered();
+  on_actionJT65_triggered();
 }
diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui
index e36aa078c..021062705 100644
--- a/widgets/mainwindow.ui
+++ b/widgets/mainwindow.ui
@@ -3017,7 +3017,7 @@ QLabel[oob=&quot;true&quot;] {
               <enum>Qt::StrongFocus</enum>
              </property>
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to Q65 mode. Right-click to toggle Q65 Pileup mode On/Off.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to Q65 mode.&lt;br&gt; Right-click to switch to Q65 Pileup mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
               <string>Q65</string>
@@ -3038,8 +3038,11 @@ QLabel[oob=&quot;true&quot;] {
                <height>16777215</height>
               </size>
              </property>
+             <property name="focusPolicy">
+              <enum>Qt::StrongFocus</enum>
+             </property>
              <property name="toolTip">
-              <string>Switch to JT65 mode</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to JT65 mode. &lt;br&gt;Right-click to switch to JT9 mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="text">
               <string>JT65</string>