diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp
index 84a18a28..f2668e9d 100644
--- a/sleepyhead/Graphs/gGraphView.cpp
+++ b/sleepyhead/Graphs/gGraphView.cpp
@@ -3991,7 +3991,11 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent * event)
             if ((y >= py) && (y <= py + h)) {
                 if (x < titleWidth) {
                     // What to do when double clicked on the graph title ??
+
                     m_graphs[i]->mouseDoubleClickEvent(event);
+                    // pin the graph??
+                    m_graphs[i]->setPinned(false);
+                    redraw();
                 } else {
                     // send event to graph..
                     m_graphs[i]->mouseDoubleClickEvent(event);
@@ -4025,6 +4029,9 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent * event)
                 if (x < titleWidth) {
                     // What to do when double clicked on the graph title ??
                     m_graphs[i]->mouseDoubleClickEvent(event);
+
+                    m_graphs[i]->setPinned(true);
+                    redraw();
                 } else {
                     // send event to graph..
                     m_graphs[i]->mouseDoubleClickEvent(event);
diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index 341ad451..2bb1c5c7 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -121,7 +121,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     SF=new gGraph(GraphView,STR_TR_EventFlags,STR_TR_EventFlags,default_height);
 
     SF->setPinned(true);
-    ui->pinFlagsButton->setChecked(true);
     FRW=new gGraph(GraphView,STR_TR_FlowRate, schema::channel[CPAP_FlowRate].fullname()+"\n"+schema::channel[CPAP_FlowRate].description()+"\n("+schema::channel[CPAP_FlowRate].units()+")",default_height);
     //FRW->setPinned(true);
 
@@ -365,9 +364,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
 
     GraphView->LoadSettings("Daily");
 
-    ui->pinFlowButton->setChecked(FRW->isPinned());
-    ui->pinFlagsButton->setChecked(SF->isPinned());
-
     icon_on=new QIcon(":/icons/session-on.png");
     icon_off=new QIcon(":/icons/session-off.png");
 
@@ -2162,15 +2158,3 @@ void Daily::on_resetLayoutButton_clicked()
 {
     GraphView->resetLayout();
 }
-
-void Daily::on_pinFlagsButton_toggled(bool checked)
-{
-    SF->setPinned(checked);
-    GraphView->redraw();
-}
-
-void Daily::on_pinFlowButton_toggled(bool checked)
-{
-    FRW->setPinned(checked);
-    GraphView->redraw();
-}
diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h
index 0e1b18f4..c7045b22 100644
--- a/sleepyhead/daily.h
+++ b/sleepyhead/daily.h
@@ -249,10 +249,6 @@ private slots:
 
     void doToggleSession(Session *);
 
-    void on_pinFlagsButton_toggled(bool checked);
-
-    void on_pinFlowButton_toggled(bool checked);
-
 protected:
 
 private:
diff --git a/sleepyhead/daily.ui b/sleepyhead/daily.ui
index 199c9e25..40d33a82 100644
--- a/sleepyhead/daily.ui
+++ b/sleepyhead/daily.ui
@@ -1052,26 +1052,6 @@ QToolButton:pressed {
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QPushButton" name="pinFlagsButton">
-            <property name="text">
-             <string>Pin Flags</string>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="pinFlowButton">
-            <property name="text">
-             <string>Pin Flow</string>
-            </property>
-            <property name="checkable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item>
            <layout class="QHBoxLayout" name="sessionBarLayout">
             <property name="sizeConstraint">
diff --git a/sleepyhead/overview.cpp b/sleepyhead/overview.cpp
index cf89023b..76530741 100644
--- a/sleepyhead/overview.cpp
+++ b/sleepyhead/overview.cpp
@@ -270,6 +270,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) :
     // <--- The code to the previous marker is crap
 
     GraphView->LoadSettings("Overview"); //no trans
+    AHI->setPinned(false);
     ui->rangeCombo->setCurrentIndex(6);
     icon_on=new QIcon(":/icons/session-on.png");
     icon_off=new QIcon(":/icons/session-off.png");