1 files changed, 8 insertions, 3 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/QueryScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/QueryScreen.java
index b94fcaef46..01e294fafb 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/QueryScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/QueryScreen.java
@@ -19,7 +19,7 @@ import com.google.gerrit.client.rpc.GerritCallback;
 import com.google.gerrit.common.PageLinks;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.RevId;
-import com.google.gwtjsonrpc.common.AsyncCallback;
+import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwtorm.client.KeyUtil;
 
 public class QueryScreen extends PagedSingleListScreen implements
@@ -52,12 +52,11 @@ public class QueryScreen extends PagedSingleListScreen implements
       @Override
       public final void onSuccess(ChangeList result) {
         if (isAttached()) {
-          if (result.size() == 1 && isSingleQuery(query)) {
+          if (result.length() == 1 && isSingleQuery(query)) {
             ChangeInfo c = result.get(0);
             Change.Id id = c.legacy_id();
             Gerrit.display(PageLinks.toChange(id), new ChangeScreen(id));
           } else {
-            Gerrit.setQueryString(query);
             display(result);
             QueryScreen.this.display();
           }
@@ -67,6 +66,12 @@ public class QueryScreen extends PagedSingleListScreen implements
   }
 
   @Override
+  public void onShowView() {
+    super.onShowView();
+    Gerrit.setQueryString(query);
+  }
+
+  @Override
   protected void loadPrev() {
     ChangeList.prev(query, pageSize, pos, loadCallback());
   }