diff --git a/services/web/public/src/ide/review-panel/directives/addCommentEntry.js b/services/web/public/src/ide/review-panel/directives/addCommentEntry.js
index eadf6e8bc5..a10ff05754 100644
--- a/services/web/public/src/ide/review-panel/directives/addCommentEntry.js
+++ b/services/web/public/src/ide/review-panel/directives/addCommentEntry.js
@@ -50,13 +50,18 @@ define(['base'], App =>
 
       return (scope.submitNewComment = function(event) {
         // If this is from a blur event from clicking on cancel, ignore it.
-        if (
-          event != null &&
-          event.type === 'blur' &&
-          $(event.relatedTarget).hasClass('rp-entry-button-cancel')
-        ) {
-          return true
+        if (event != null && event.type === 'blur') {
+          if (
+            // Includes relatedTarget workaround for Firefox
+            $(event.relatedTarget).hasClass('rp-entry-button-cancel') ||
+            $(event.originalEvent.explicitOriginalTarget).hasClass(
+              'rp-entry-button-cancel'
+            )
+          ) {
+            return true
+          }
         }
+
         scope.onSubmit({ content: scope.state.content })
         scope.state.isAdding = false
         return (scope.state.content = '')