diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp
index 3c35c9d4..0d145228 100644
--- a/SleepLib/day.cpp
+++ b/SleepLib/day.cpp
@@ -349,12 +349,13 @@ bool Day::channelExists(ChannelID id)
 }
 bool Day::channelHasData(ChannelID id)
 {
+    bool r=false;
     for (int i=0;i<sessions.size();i++) {
-        if (!sessions[i]->channelExists(id)) {
-            return false;
+        if (sessions[i]->channelExists(id)) {
+            r=true;
         }
     }
-    return true;
+    return r;
 }
 
 void Day::OpenEvents()
diff --git a/daily.cpp b/daily.cpp
index a7759e89..1d440044 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -358,6 +358,7 @@ void Daily::on_calendar_selectionChanged()
 
     Load(ui->calendar->selectedDate());
     ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate));
+    ui->calendar->setFocus(Qt::ActiveWindowFocusReason);
 }
 void Daily::ResetGraphLayout()
 {
@@ -865,8 +866,9 @@ void Daily::on_nextDayButton_clicked()
 
 void Daily::on_calButton_toggled(bool checked)
 {
-    ui->calendar->setVisible(checked);
-    if (!checked) ui->calButton->setArrowType(Qt::DownArrow);
+    bool b=!ui->calendar->isVisible();
+    ui->calendar->setVisible(b);
+    if (!b) ui->calButton->setArrowType(Qt::DownArrow);
     else ui->calButton->setArrowType(Qt::UpArrow);
 }