diff --git a/daily.cpp b/daily.cpp
index 20df9b40..fbfde781 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -36,6 +36,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
 {
     ui->setupUi(this);
 
+    // Remove Incomplete Extras Tab
+    ui->tabWidget->removeTab(3);
+
     QList<int> a;
     a.push_back(300);
     a.push_back(this->width()-300);
diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp
index 445ff242..84ba215e 100644
--- a/preferencesdialog.cpp
+++ b/preferencesdialog.cpp
@@ -15,6 +15,9 @@ PreferencesDialog::PreferencesDialog(QWidget *parent,Profile * _profile) :
     profile(_profile)
 {
     ui->setupUi(this);
+
+    ui->tabWidget->removeTab(3);
+
     Q_ASSERT(profile!=NULL);
     ui->tabWidget->setCurrentIndex(0);
     int i=ui->unitCombo->findText((*profile)["UnitSystem"].toString());
@@ -260,7 +263,9 @@ void PreferencesDialog::on_bigFontSize_valueChanged(int arg1)
 
 void PreferencesDialog::on_useGraphSnapshots_toggled(bool checked)
 {
-    if (checked && QMessageBox::question(this,"Warning","The Graph Snapshots feature (used by the Pie Chart in Daily stats panel) has been known to not work on some older computers.\n\nIf you experience a crash because of it, you will have to remove your SleepApp folder and recreate your profile.\n\n(I'm fairly sure this Qt bug is fixed now, but this has not been tested enough. If you have previously seen the pie chart, it's perfectly ok.)\n\nAre you sure you want to enable it?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) {
+    if (checked
+        && !(*profile)["EnableGraphSnapshots"].toBool()
+        && QMessageBox::question(this,"Warning","The Graph Snapshots feature (used by the Pie Chart in Daily stats panel) has been known to not work on some older computers.\n\nIf you experience a crash because of it, you will have to remove your SleepApp folder and recreate your profile.\n\n(I'm fairly sure this Qt bug is fixed now, but this has not been tested enough. If you have previously seen the pie chart, it's perfectly ok.)\n\nAre you sure you want to enable it?",QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) {
         ui->useGraphSnapshots->setChecked(false);
     }
 }