diff --git a/src/components/forms/AddSolutionForm.js b/src/components/forms/AddSolutionForm.js
index 78dc480acc011f3b808d9284a336110dd283a3fb..e0b82c06a5ff2b87cfe98c23fb29cbdaa93205f9 100644
--- a/src/components/forms/AddSolutionForm.js
+++ b/src/components/forms/AddSolutionForm.js
@@ -12,7 +12,7 @@ const allowedFileTypes = [
   'application/x-zip-compressed',
 ];
 
-//in megabytes
+// in megabytes
 const maxFileSize = 50;
 
 class AddSolutionForm extends Component {
@@ -36,6 +36,8 @@ class AddSolutionForm extends Component {
     return (
       <Modal
         open={this.state.showModal}
+        closeOnDimmerClick
+        onClose={() => this.setState({ showModal: false })}
         trigger={
           <button
             id='task'
diff --git a/src/components/forms/AddTaskForm.js b/src/components/forms/AddTaskForm.js
index 618d0827c107debdc97fc72879fc088ee39446eb..6b386a732d95a39098334cadb747e12a57310341 100644
--- a/src/components/forms/AddTaskForm.js
+++ b/src/components/forms/AddTaskForm.js
@@ -18,6 +18,8 @@ class AddTaskForm extends Component {
     return (
       <Modal
         open={this.state.showModal}
+        closeOnDimmerClick
+        onClose={() => this.setState({ showModal: false })}
         trigger={
           <Button
             inverted
diff --git a/src/components/forms/CorrectSolutionForm.js b/src/components/forms/CorrectSolutionForm.js
index 6c6a65ea8a352c6f0e615833fb07abd65be805fc..5cbf8a136d3c86f0d894952b7576705c3456dae6 100644
--- a/src/components/forms/CorrectSolutionForm.js
+++ b/src/components/forms/CorrectSolutionForm.js
@@ -43,6 +43,8 @@ class CorrectSolutionForm extends Component {
     return (
       <Modal
         open={this.state.showModal}
+        closeOnDimmerClick
+        onClose={() => this.setState({ showModal: false })}
         trigger={
           <Button
             inverted
diff --git a/src/components/forms/EditTaskForm.js b/src/components/forms/EditTaskForm.js
index ccf532044d3020e3cb0b6cb36f649cdd0ecf0920..0574f3a49721b3230bb6d2f7d2180a9237738799 100644
--- a/src/components/forms/EditTaskForm.js
+++ b/src/components/forms/EditTaskForm.js
@@ -24,6 +24,8 @@ class EditTaskForm extends Component {
       <Modal
         open={this.state.showModal}
         onOpen={this.props.onClick}
+        closeOnDimmerClick
+        onClose={() => this.setState({ showModal: false })}
         trigger={
           <Button
             inverted
diff --git a/src/components/forms/SolutionDetailsForm.js b/src/components/forms/SolutionDetailsForm.js
index b15d1e54befbadcdb2d871d48a4d92e812738fb7..8e2279ccad1d0399b64a6443003864f92f077883 100644
--- a/src/components/forms/SolutionDetailsForm.js
+++ b/src/components/forms/SolutionDetailsForm.js
@@ -48,6 +48,8 @@ class SolutionDetailsForm extends Component {
     return (
       <Modal
         open={this.state.showModal}
+        closeOnDimmerClick
+        onClose={() => this.setState({ showModal: false })}
         trigger={
           <button
             id='task'