diff --git a/app/assets/javascripts/editor/participantsupport.js.erb b/app/assets/javascripts/editor/participantsupport.js.erb
index e3529cdb..988c6d38 100644
--- a/app/assets/javascripts/editor/participantsupport.js.erb
+++ b/app/assets/javascripts/editor/participantsupport.js.erb
@@ -108,13 +108,15 @@ CodeOceanEditorFlowr = {
 CodeOceanEditorRequestForComments = {
   requestComments: function () {
     const cause = $('#requestComments');
+    const editor = $('#editor')
+    const questionElement = $('#question')
     this.startSentryTransaction(cause);
-    $('#question').prop("disabled", true);
+    questionElement.prop("disabled", true);
     $('#closeAskForCommentsButton').addClass('d-none');
 
-    var exercise_id = $('#editor').data('exercise-id');
+    var exercise_id = editor.data('exercise-id');
     var file_id = $('.editor').data('id');
-    var question = $('#question').val();
+    var question = questionElement.val();
 
     var createRequestForComments = function (submission) {
       this.showSpinner($('#askForCommentsButton'));
diff --git a/app/assets/javascripts/editor/submissions.js b/app/assets/javascripts/editor/submissions.js
index ae822988..f976c23f 100644
--- a/app/assets/javascripts/editor/submissions.js
+++ b/app/assets/javascripts/editor/submissions.js
@@ -163,7 +163,7 @@ CodeOceanEditorSubmissions = {
     this.startSentryTransaction(cause);
     event.preventDefault();
     this.stopCode(event);
-    if ($('#run').is(':visible')) {
+    if (cause.is(':visible')) {
       this.createSubmission(cause, null, this.runSubmission.bind(this));
     }
   },