diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index f5d71d6..e0368c3 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -3844,6 +3844,12 @@
                             getTopWindow().loadUrl(data);
                         }
                     }
+/*
+                FIXME: Removing this breaks the behavior of pressing BACK from
+                the Go page resulting in the window being closed.  However, it
+                needs to be removed so that the user can use the Search bar to
+                enter a URL.  Further, the Go behavior is going to change
+                drastically, so this behavior may not last anyway.
                 } else if (resultCode == RESULT_CANCELED
                         && mCancelGoPageMeansClose) {
                     if (mTabControl.getTabCount() == 1) {
@@ -3854,6 +3860,7 @@
                         return;
                     }
                     closeCurrentWindow();
+*/
                 }
                 break;
             default: