diff --git a/src/components/DateSlidePickerBox.cpp b/src/components/DateSlidePickerBox.cpp
index ba10389..2577922 100644
--- a/src/components/DateSlidePickerBox.cpp
+++ b/src/components/DateSlidePickerBox.cpp
@@ -67,6 +67,7 @@ void DateSlidePickerBox::setSelectedValue(const QString &val) {
     mTenYearBox->setSelectedValue(val.left(3).right(1));
     mYearBox->setSelectedValue(val.left(4).right(1));
     QStringList splitList = val.split('-');
+    if (splitList.length()<3) return;
     mMonthBox->setSelectedValue(splitList[1]);
     mDayBox->setSelectedValue(splitList[2]);
 }
diff --git a/src/forms/select/SelectFormWidget.cpp b/src/forms/select/SelectFormWidget.cpp
index 6598e10..665959f 100644
--- a/src/forms/select/SelectFormWidget.cpp
+++ b/src/forms/select/SelectFormWidget.cpp
@@ -89,8 +89,8 @@ void SelectFormWidget::prepareButtons(bool disableALL) {
     bool stateFlag = (mPatTable->currentIndex().row() >= 0);
 
     mBtnAdd->setEnabled(!anonymousMode && !disableALL);
-    // if (mBtnAdd)mBtnEdit->setEnabled(!anonymousMode && stateFlag && !disableALL);
-    // if (mBtnAdd)mBtnDelete->setEnabled(!anonymousMode&& stateFlag && !disableALL);
+    if (mBtnAdd)mBtnEdit->setEnabled(!anonymousMode && stateFlag && !disableALL);
+    if (mBtnAdd)mBtnDelete->setEnabled(!anonymousMode&& stateFlag && !disableALL);
     mBtnSelect->setEnabled(stateFlag && !disableALL);
 }