diff --git a/src/components/forms/AddTaskForm.js b/src/components/forms/AddTaskForm.js
index f08b1b351627cd274bf9aba40fa4666bb196b865..618d0827c107debdc97fc72879fc088ee39446eb 100644
--- a/src/components/forms/AddTaskForm.js
+++ b/src/components/forms/AddTaskForm.js
@@ -76,7 +76,12 @@ class AddTaskForm extends Component {
           <Button
             inverted
             color='green'
-            disabled={(title === '' || text === '' || deadline === '' || moment().isAfter(deadline))}
+            disabled={
+              title === '' ||
+              title.length > 150 ||
+              text === '' ||
+              deadline === '' || moment().isAfter(deadline)
+            }
             onClick={() => {
               this.props.addTask({ title, text, deadline });
               this.setState({ showModal: false });
diff --git a/src/components/forms/EditTaskForm.js b/src/components/forms/EditTaskForm.js
index 4f7ed08a71d3d58c1bc9d2294ece65fe7ca4d7a2..a509d158de6ca159fdce2eda475ea53be63bfeaf 100644
--- a/src/components/forms/EditTaskForm.js
+++ b/src/components/forms/EditTaskForm.js
@@ -82,7 +82,12 @@ class EditTaskForm extends Component {
           <Button
             inverted
             color='green'
-            disabled={(title === '' || text === '' || deadline === '' || moment().isAfter(deadline))}
+            disabled={
+              title === '' ||
+              title.length > 150 ||
+              text === '' ||
+              deadline === '' || moment().isAfter(deadline)
+            }
             onClick={() => {
               this.props.editTask({
                 id,