diff --git a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
index 134629b4..d21f1908 100644
--- a/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
+++ b/src/gui/qt/changecompleteblindsdialog/changecompleteblindsdialogimpl.cpp
@@ -42,8 +42,14 @@ void changeCompleteBlindsDialogImpl::exec() {
 
 void changeCompleteBlindsDialogImpl::addBlindValueToList() {
 
-	listWidget_blinds->addItem(QString::number(spinBox_input->value(),10));
-	sortBlindsList();
+	if(listWidget_blinds->count() == 30) { 
+		QMessageBox::warning(this, tr("Manual Blinds Order"),
+			tr("You cannot set more than 30 manual blinds."),
+			QMessageBox::Close); }
+	else {
+		listWidget_blinds->addItem(QString::number(spinBox_input->value(),10));
+		sortBlindsList();
+	}
 }
 
 void changeCompleteBlindsDialogImpl::removeBlindFromList() {