diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
index 1cda9ae59..75939c7f9 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarUIView.kt
@@ -58,10 +58,6 @@ class ToolbarUIView(
                     url = text
                     actionEmitter.onNext(SearchAction.TextChanged(text))
                 }
-
-                override fun onStopEditing() {
-//                    actionEmitter.onNext(SearchAction.UrlCommitted(url))
-                }
             })
         }
 
diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index 60e7c7b12..a337536ad 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -98,6 +98,11 @@ class SearchFragment : Fragment() {
             }
     }
 
+    // Issue: https://github.com/mozilla-mobile/fenix/issues/626
+    // Currently we were kind of forcing all this logic through the Toolbar Feature.
+    // But since we cannot actually load a page without an available GeckoSession
+    // we have to wait until after we navigate to call the use case.
+    // We should move this logic into a place that makes more sense.
     private fun load(text: String) {
         val sessionId = SearchFragmentArgs.fromBundle(arguments!!).sessionId
         val isPrivate = SearchFragmentArgs.fromBundle(arguments!!).isPrivateTab