diff --git a/src/com/android/browser/EdgeSwipeController.java b/src/com/android/browser/EdgeSwipeController.java
index 87ad2e7..fe991e8 100644
--- a/src/com/android/browser/EdgeSwipeController.java
+++ b/src/com/android/browser/EdgeSwipeController.java
@@ -459,7 +459,7 @@
 
     public void onEdgeTouched (int edgeFlags, int pointerId) {
         synchronized (this) {
-            if (mActiveTab.isPrivateBrowsingEnabled()) {
+            if (mActiveTab.isPrivateBrowsingEnabled() || mActiveTab.isKeyboardShowing()) {
                 mDragHelper.abort();
                 return;
             }
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index 4b361a1..e331cd9 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -107,6 +107,7 @@
     private static final int INITIAL_PROGRESS = 5;
 
     private static Bitmap sDefaultFavicon;
+    private boolean mIsKeyboardUp = false;
 
     private static Paint sAlphaPaint = new Paint();
     static {
@@ -698,6 +699,7 @@
 
         @Override
         public void onKeyboardStateChange(boolean popup) {
+            mIsKeyboardUp = popup;
             if (BrowserSettings.getInstance().useFullscreen()) {
                 Controller controller = (Controller) mWebViewController;
                 BaseUi ui = (BaseUi) controller.getUi();
@@ -737,6 +739,11 @@
         return mTouchIconUrl;
     }
 
+    public boolean isKeyboardShowing() {
+        Controller controller = (Controller)mWebViewController;
+        return (mIsKeyboardUp || controller.getUi().isEditingUrl());
+    }
+
     public boolean isTabFullScreen() {
         return mFullScreen;
     }