diff --git a/app/views/main/submission.html.haml b/app/views/main/submission.html.haml
--- a/app/views/main/submission.html.haml
+++ b/app/views/main/submission.html.haml
@@ -8,9 +8,9 @@
       = select 'submission',
         'problem_id',
         @problems.collect {|p| ["[#{p.name}] #{p.full_name}", main_submission_url(p.id)]},
-        {:selected => '-1'},
-        { class: 'select2 form-control' }
-      %button.btn.btn-primary.btn-sm#submission_problem_go Go
+        { selected: (@problem ? main_submission_url(@problem) : -1) },
+        { class: 'select2 form-control'} 
+      %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: '#submission_problem_id'}} Go
 
 - if @problem!=nil
   %h2= "Task: #{@problem.full_name} (#{@problem.name})"