diff --git a/mainwindow.cpp b/mainwindow.cpp
index a7a449e97..243f8327e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1171,8 +1171,8 @@ void MainWindow::readSettings()
   m_audioThreadPriority = static_cast<QThread::Priority> (m_settings->value ("Audio/ThreadPriority", QThread::HighPriority).toInt () % 8);
   m_settings->endGroup ();
 
-  if (displayMsgAvg) on_actionMessage_averaging_triggered();
   setContestType();
+  if(displayMsgAvg or (m_nContest>0 and m_nContest<6)) on_actionMessage_averaging_triggered();
 }
 
 void MainWindow::setContestType()
@@ -1689,6 +1689,9 @@ void MainWindow::on_actionSettings_triggered()               //Setup Dialog
       ui->actionEnable_AP_JT65->setVisible(false);
     }
     m_opCall=m_config.opCall();
+    if(m_msgAvgWidget==NULL and m_nContest>0 and m_nContest<6) {
+      on_actionMessage_averaging_triggered();
+    }
   }
   setColorHighlighting();
 }
diff --git a/mainwindow.ui b/mainwindow.ui
index fc92c66ec..ec71499f0 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1048,6 +1048,9 @@ QLabel[oob=&quot;true&quot;] {
                </item>
                <item row="2" column="1">
                 <widget class="QLabel" name="labNextCall">
+                 <property name="toolTip">
+                  <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Double-click on another caller to queue that call for your next QSO.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                 </property>
                  <property name="text">
                   <string>Next Call</string>
                  </property>