diff --git a/src/containers/SubmitSolutionContainer/SubmitSolutionContainer.js b/src/containers/SubmitSolutionContainer/SubmitSolutionContainer.js
index 3f0c03b35..0e741846a 100644
--- a/src/containers/SubmitSolutionContainer/SubmitSolutionContainer.js
+++ b/src/containers/SubmitSolutionContainer/SubmitSolutionContainer.js
@@ -49,7 +49,7 @@ class SubmitSolutionContainer extends Component {
     if (presubmitEnvironments && presubmitEnvironments.length > 0) {
       let newEnv = state.selectedEnvironment;
       if (newEnv && !presubmitEnvironments.find(e => e.id === newEnv)) {
-        newEnv = null; // selected env is not availabe anymore
+        newEnv = null; // selected env is not available anymore
       }
       if (!newEnv) {
         newEnv = presubmitEnvironments[0].id;
diff --git a/src/pages/Assignment/Assignment.js b/src/pages/Assignment/Assignment.js
index b512ce361..620d4ae8d 100644
--- a/src/pages/Assignment/Assignment.js
+++ b/src/pages/Assignment/Assignment.js
@@ -223,19 +223,6 @@ class Assignment extends Component {
                             )}
                           </ResourceRenderer>
                         </p>
-                        {canSubmitObj.canSubmit && (
-                          <SubmitSolutionContainer
-                            userId={loggedInUserId}
-                            id={assignment.id}
-                            onSubmit={submitSolution}
-                            presubmitValidation={presubmitSolution}
-                            afterEvaluationStarts={this.reloadAfterSubmit}
-                            onReset={init}
-                            isOpen={submitting}
-                            solutionFilesLimit={assignment.solutionFilesLimit}
-                            solutionSizeLimit={assignment.solutionSizeLimit}
-                          />
-                        )}
                       </div>
                     )}
 
@@ -288,6 +275,18 @@ class Assignment extends Component {
                 </Row>
               )}
             </ResourceRenderer>
+
+            <SubmitSolutionContainer
+              userId={loggedInUserId}
+              id={assignment.id}
+              onSubmit={submitSolution}
+              presubmitValidation={presubmitSolution}
+              afterEvaluationStarts={this.reloadAfterSubmit}
+              onReset={init}
+              isOpen={submitting}
+              solutionFilesLimit={assignment.solutionFilesLimit}
+              solutionSizeLimit={assignment.solutionSizeLimit}
+            />
           </div>
         )}
       </Page>
diff --git a/src/pages/Solution/Solution.js b/src/pages/Solution/Solution.js
index 36c10bdfe..8634d5296 100644
--- a/src/pages/Solution/Solution.js
+++ b/src/pages/Solution/Solution.js
@@ -200,26 +200,29 @@ class Solution extends Component {
                         )}
 
                       {isStudent && (
-                        <ResourceRenderer resource={canSubmit}>
-                          {canSubmitObj =>
-                            canSubmitObj.canSubmit && (
-                              <>
-                                <SubmitSolutionButton onClick={initCanSubmit(assignment.id)} />
-                                <SubmitSolutionContainer
-                                  userId={currentUser.id}
-                                  id={assignment.id}
-                                  onSubmit={submitSolution}
-                                  presubmitValidation={presubmitSolution}
-                                  afterEvaluationStarts={() => reloadAfterSubmit(currentUser.id)}
-                                  onReset={initCanSubmit}
-                                  isOpen={submitting}
-                                  solutionFilesLimit={assignment.solutionFilesLimit}
-                                  solutionSizeLimit={assignment.solutionSizeLimit}
-                                />
-                              </>
-                            )
-                          }
-                        </ResourceRenderer>
+                        <>
+                          <ResourceRenderer resource={canSubmit}>
+                            {canSubmitObj =>
+                              canSubmitObj.canSubmit && (
+                                <>
+                                  <SubmitSolutionButton onClick={initCanSubmit(assignment.id)} />
+                                </>
+                              )
+                            }
+                          </ResourceRenderer>
+
+                          <SubmitSolutionContainer
+                            userId={currentUser.id}
+                            id={assignment.id}
+                            onSubmit={submitSolution}
+                            presubmitValidation={presubmitSolution}
+                            afterEvaluationStarts={() => reloadAfterSubmit(currentUser.id)}
+                            onReset={initCanSubmit}
+                            isOpen={submitting}
+                            solutionFilesLimit={assignment.solutionFilesLimit}
+                            solutionSizeLimit={assignment.solutionSizeLimit}
+                          />
+                        </>
                       )}
                     </TheButtonGroup>