diff --git a/lib/mskrtd.f90 b/lib/mskrtd.f90
index 0396cf26e..0e2904854 100644
--- a/lib/mskrtd.f90
+++ b/lib/mskrtd.f90
@@ -116,7 +116,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall,   &
   np=8*NSPM
   call msk144spd(cdat,np,ntol,ndecodesuccess,msgreceived,fc,fest,tdec,navg,ct, &
                  softbits,recent_calls,nrecent)
-  if(ndecodesuccess.eq.0 .and. bshmsg) then
+  if(ndecodesuccess.eq.0 .and. (bshmsg.or.bswl)) then
      call msk40spd(cdat,np,ntol,mycall(1:6),hiscall(1:6),bswl,nhasharray,      &
               recent_calls,nrecent,ndecodesuccess,msgreceived,fc,fest,tdec,navg)
   endif
diff --git a/mainwindow.cpp b/mainwindow.cpp
index c147c66a0..0a5556ff5 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -4178,7 +4178,6 @@ void MainWindow::displayWidgets(int n)
     }
     if(i==23) {
       ui->cbSWL->setVisible(b);
-      ui->cbSWL->setEnabled(b and ui->cbShMsgs->isChecked());
     }
     j=j>>1;
   }
@@ -5569,9 +5568,8 @@ void MainWindow::on_cbFast9_clicked(bool b)
 void MainWindow::on_cbShMsgs_toggled(bool b)
 {
   ui->cbTx6->setEnabled(b);
-  ui->cbSWL->setEnabled(b);
   m_bShMsgs=b;
-  if(!b) ui->cbSWL->setChecked(false);
+  if(b) ui->cbSWL->setChecked(false);
   if(m_bShMsgs and (m_mode=="MSK144")) ui->rptSpinBox->setValue(1);
   int itone0=itone[0];
   int ntx=m_ntx;
@@ -5585,6 +5583,11 @@ void MainWindow::on_cbShMsgs_toggled(bool b)
   if(ntx==6) ui->txrb6->setChecked(true);
 }
 
+void MainWindow::on_cbSWL_toggled(bool b)
+{
+  if(b) ui->cbShMsgs->setChecked(false);
+}
+
 void MainWindow::on_cbTx6_toggled(bool b)
 {
   QString t;
diff --git a/mainwindow.h b/mainwindow.h
index 807cc9677..ce25acaf7 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -226,6 +226,7 @@ private slots:
   void VHF_features_enabled(bool b);
   void on_sbSubmode_valueChanged(int n);
   void on_cbShMsgs_toggled(bool b);
+  void on_cbSWL_toggled(bool b);
   void on_cbTx6_toggled(bool b);
   void networkError (QString const&);
   void on_ClrAvgButton_clicked();
diff --git a/mainwindow.ui b/mainwindow.ui
index 7f1438a1d..c0c720920 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>MainWindow</class>
  <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>867</width>
+    <height>583</height>
+   </rect>
+  </property>
   <property name="windowTitle">
    <string>WSJT-X   by K1JT</string>
   </property>
@@ -990,7 +998,7 @@ QLabel[oob=&quot;true&quot;] {
                  <item row="15" column="0">
                   <widget class="QCheckBox" name="cbSWL">
                    <property name="enabled">
-                    <bool>false</bool>
+                    <bool>true</bool>
                    </property>
                    <property name="maximumSize">
                     <size>
@@ -2352,6 +2360,14 @@ QPushButton[state=&quot;ok&quot;] {
    </layout>
   </widget>
   <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>867</width>
+     <height>21</height>
+    </rect>
+   </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>File</string>