diff --git a/mainwindow.cpp b/mainwindow.cpp
index 59d8e02c0..4c598660f 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3454,6 +3454,11 @@ void MainWindow::on_txrb1_toggled(bool status)
   }
 }
 
+void MainWindow::on_txrb1_doubleClicked()
+{
+  ui->tx1->setEnabled (!ui->tx1->isEnabled ());
+}
+
 void MainWindow::on_txrb2_toggled(bool status)
 {
   // Tx 2 means we already have CQ'd so good reference
@@ -3501,10 +3506,20 @@ void MainWindow::on_txrb6_toggled(bool status)
 
 void MainWindow::on_txb1_clicked()
 {
+  if (ui->tx1->isEnabled ()) {
     m_ntx=1;
     m_QSOProgress = REPLYING;
     ui->txrb1->setChecked(true);
     if (m_transmitting) m_restart=true;
+  }
+  else {
+    on_txb2_clicked ();
+  }
+}
+
+void MainWindow::on_txb1_doubleClicked()
+{
+  ui->tx1->setEnabled (!ui->tx1->isEnabled ());
 }
 
 void MainWindow::on_txb2_clicked()
@@ -3825,9 +3840,16 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
     }
     else {
       // treat like a CQ/QRZ
-      m_ntx=1;
-      m_QSOProgress = REPLYING;
-      ui->txrb1->setChecked(true);
+      if (ui->tx1->isEnabled ()) {
+        m_ntx = 1;
+        m_QSOProgress = REPLYING;
+        ui->txrb1->setChecked (true);
+      }
+      else {
+        m_ntx = 2;
+        m_QSOProgress = REPORT;
+        ui->txrb2->setChecked (true);
+      }
       if(ui->tabWidget->currentIndex()==1) {
         gen_msg = 1;
         m_ntx=7;
@@ -3849,11 +3871,18 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
   }
   else // just work them
     {
-      m_ntx=1;
-      m_QSOProgress = REPLYING;
-      ui->txrb1->setChecked(true);
-      if(ui->tabWidget->currentIndex()==1) {
-        gen_msg = 1;
+      if (ui->tx1->isEnabled ()) {
+        m_ntx = 1;
+        m_QSOProgress = REPLYING;
+        ui->txrb1->setChecked (true);
+      }
+      else {
+        m_ntx = 2;
+        m_QSOProgress = REPORT;
+        ui->txrb2->setChecked (true);
+      }
+      if (1 == ui->tabWidget->currentIndex ()) {
+        gen_msg = m_ntx;
         m_ntx=7;
         m_gen_message_is_cq = false;
       }
diff --git a/mainwindow.h b/mainwindow.h
index fc519c490..6af2e5e53 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -156,6 +156,7 @@ private slots:
   void set_dateTimeQSO(int m_ntx);
   void set_ntx(int n);
   void on_txrb1_toggled(bool status);
+  void on_txrb1_doubleClicked ();
   void on_txrb2_toggled(bool status);
   void on_txrb3_toggled(bool status);
   void on_txrb4_toggled(bool status);
@@ -163,6 +164,7 @@ private slots:
   void on_txrb5_doubleClicked ();
   void on_txrb6_toggled(bool status);
   void on_txb1_clicked();
+  void on_txb1_doubleClicked ();
   void on_txb2_clicked();
   void on_txb3_clicked();
   void on_txb4_clicked();
diff --git a/mainwindow.ui b/mainwindow.ui
index 66a2d7cf5..622c7f14c 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1097,7 +1097,7 @@ QLabel[oob="true"] {
                     </widget>
                    </item>
                    <item row="1" column="1" alignment="Qt::AlignHCenter|Qt::AlignVCenter">
-                    <widget class="QRadioButton" name="txrb1">
+                    <widget class="DoubleClickableRadioButton" name="txrb1">
                      <property name="toolTip">
                       <string>Send this message in next Tx interval</string>
                      </property>
@@ -1113,7 +1113,7 @@ QLabel[oob=&quot;true&quot;] {
                     </widget>
                    </item>
                    <item row="1" column="2">
-                    <widget class="QPushButton" name="txb1">
+                    <widget class="DoubleClickablePushButton" name="txb1">
                      <property name="maximumSize">
                       <size>
                        <width>30</width>