diff --git a/Configuration.ui b/Configuration.ui
index e6ce461..d9d0817 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -550,7 +550,7 @@
             <item>
              <widget class="QLabel" name="label_10">
               <property name="text">
-               <string>Tx watchdog:</string>
+               <string>Idle watchdog timer:</string>
               </property>
               <property name="buddy">
                <cstring>tx_watchdog_spin_box</cstring>
@@ -560,7 +560,7 @@
             <item>
              <widget class="QSpinBox" name="tx_watchdog_spin_box">
               <property name="toolTip">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes before unattended transmissions are aborted&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes before unattended transmissions are aborted (beacons, auto-replies, etc).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="specialValueText">
                <string>Disabled</string>
@@ -571,8 +571,11 @@
               <property name="prefix">
                <string/>
               </property>
+              <property name="maximum">
+               <number>1440</number>
+              </property>
               <property name="singleStep">
-               <number>5</number>
+               <number>1</number>
               </property>
               <property name="value">
                <number>0</number>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5078f62..79ba504 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6552,6 +6552,9 @@ void MainWindow::checkBeacon(){
     if(m_nextBeaconQueued){
         return;
     }
+    if(m_tx_watchdog){
+        return;
+    }
 
     prepareBeacon();
 }
@@ -9784,6 +9787,10 @@ void MainWindow::processSpots() {
 }
 
 void MainWindow::processTxQueue(){
+    if(m_tx_watchdog){
+        return;
+    }
+
     if(m_txMessageQueue.isEmpty()){
         return;
     }
@@ -10915,7 +10922,7 @@ void MainWindow::tx_watchdog (bool triggered)
       if (m_auto) auto_tx_mode (false);
       stopTx();
       tx_status_label.setStyleSheet ("QLabel{background-color: #ff0000}");
-      tx_status_label.setText ("Runaway Tx watchdog");
+      tx_status_label.setText ("Idle watchdog");
       QApplication::alert (this);
     }
   else
diff --git a/mainwindow.ui b/mainwindow.ui
index 24bea17..66c6f8f 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -4942,7 +4942,7 @@ list. The list can be maintained in Settings (F2).</string>
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Runaway Tx watchdog</string>
+    <string>Idle watchdog</string>
    </property>
   </action>
   <action name="actionAllow_multiple_instances">