diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+WebViewDelegates.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+WebViewDelegates.swift
index b7a59bfd28a1..c96845bec72e 100644
--- a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+WebViewDelegates.swift
+++ b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Extensions/BrowserViewController+WebViewDelegates.swift
@@ -62,6 +62,7 @@ extension BrowserViewController: WKUIDelegate {
             logger.log("Javascript message alert will be presented.", level: .info, category: .webview)
 
             present(messageAlert.alertController(), animated: true) {
+                // TODO: [FXIOS-10334] This should be called when the alert is dismissed, not presented
                 completionHandler()
                 self.logger.log("Javascript message alert was completed.", level: .info, category: .webview)
             }
@@ -69,6 +70,7 @@ extension BrowserViewController: WKUIDelegate {
             logger.log("Javascript message alert is queued.", level: .info, category: .webview)
 
             promptingTab.queueJavascriptAlertPrompt(messageAlert)
+            // TODO: [FXIOS-10334] This should be called when the alert is dismissed, not enqueued
             completionHandler()
         }
     }
diff --git a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
index 81ac6a41bc87..7fc81a131739 100644
--- a/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
+++ b/firefox-ios/Client/Frontend/Browser/BrowserViewController/Views/BrowserViewController.swift
@@ -1029,6 +1029,7 @@ class BrowserViewController: UIViewController,
         // Ensure the layout is updated immediately
         view.layoutIfNeeded()
 
+        // TODO: [FXIOS-10334] Needs investigation. Dequeuing JS alerts as part of subview layout is problematic.
         showQueuedAlertIfAvailable()
         switchToolbarIfNeeded()
         adjustURLBarHeightBasedOnLocationViewHeight()