diff --git a/Configuration.cpp b/Configuration.cpp
index 45e3b98..5f7e239 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1650,7 +1650,7 @@ void Configuration::impl::read_settings ()
   quick_call_ = settings_->value ("QuickCall", false).toBool ();
   disable_TX_on_73_ = settings_->value ("73TxDisable", false).toBool ();
   beacon_ = settings_->value ("TxBeacon", 30).toInt ();
-  watchdog_ = settings_->value ("TxWatchdog", 0).toInt ();
+  watchdog_ = settings_->value ("TxIdleWatchdog", 60).toInt ();
   if(watchdog_){
       watchdog_ = qMax(5, watchdog_);
   }
@@ -1783,7 +1783,7 @@ void Configuration::impl::write_settings ()
   settings_->setValue ("QuickCall", quick_call_);
   settings_->setValue ("73TxDisable", disable_TX_on_73_);
   settings_->setValue ("TxBeacon", beacon_);
-  settings_->setValue ("TxWatchdog", watchdog_);
+  settings_->setValue ("TxIdleWatchdog", watchdog_);
   settings_->setValue ("Tx2QSO", TX_messages_);
   settings_->setValue ("CATForceDTR", rig_params_.force_dtr);
   settings_->setValue ("DTR", rig_params_.dtr_high);
diff --git a/Configuration.ui b/Configuration.ui
index f550ecf..a73084f 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -457,7 +457,7 @@
                <string/>
               </property>
               <property name="minimum">
-               <number>10</number>
+               <number>5</number>
               </property>
               <property name="maximum">
                <number>1440</number>
@@ -466,7 +466,7 @@
                <number>1</number>
               </property>
               <property name="value">
-               <number>30</number>
+               <number>15</number>
               </property>
              </widget>
             </item>
@@ -498,6 +498,9 @@
               <property name="prefix">
                <string/>
               </property>
+              <property name="minimum">
+               <number>0</number>
+              </property>
               <property name="maximum">
                <number>1440</number>
               </property>
@@ -505,7 +508,7 @@
                <number>1</number>
               </property>
               <property name="value">
-               <number>0</number>
+               <number>60</number>
               </property>
              </widget>
             </item>
@@ -3616,11 +3619,11 @@ soundcard changes</string>
  </connections>
  <buttongroups>
   <buttongroup name="CAT_handshake_button_group"/>
-  <buttongroup name="CAT_data_bits_button_group"/>
   <buttongroup name="split_mode_button_group"/>
   <buttongroup name="TX_audio_source_button_group"/>
   <buttongroup name="TX_mode_button_group"/>
-  <buttongroup name="PTT_method_button_group"/>
+  <buttongroup name="CAT_data_bits_button_group"/>
   <buttongroup name="CAT_stop_bits_button_group"/>
+  <buttongroup name="PTT_method_button_group"/>
  </buttongroups>
 </ui>
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3893f49..a10eea8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -10118,6 +10118,9 @@ void MainWindow::tx_watchdog (bool triggered)
 
 void MainWindow::update_watchdog_label ()
 {
+    watchdog_label.setVisible (false);
+
+#if 0
   if (m_config.watchdog () && !m_mode.startsWith ("WSPR"))
     {
       watchdog_label.setText (QString {"WD:%1m"}.arg (m_config.watchdog () - m_idleMinutes));
@@ -10128,6 +10131,7 @@ void MainWindow::update_watchdog_label ()
       watchdog_label.setText (QString {});
       watchdog_label.setVisible (false);
     }
+#endif
 }
 
 void MainWindow::on_cbMenus_toggled(bool b)