1 files changed, 8 insertions, 6 deletions
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
index d1249e9c97..6b5d69189c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/PatchSetComplexDisclosurePanel.java
@@ -199,10 +199,11 @@ class PatchSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
     if (isNew && changeDetail.canStage()) {
       // Create button new button and add click handler.
       final Button stagingButton = new Button(Util.M.mergeToStagingPatchSet(detail.getPatchSet().getPatchSetId()));
+      stagingButton.setEnabled(false);
 
-      // If the change is included in a topic,  the button should be disabled
-      if(changeDetail.getChange().getTopicId() != null){
-        stagingButton.setEnabled(false);
+      // If the change is not included in a topic,  the button should be enabled
+      if(changeDetail.getChange().getTopicId() == null){
+        stagingButton.setEnabled(true);
       }
 
       stagingButton.addClickHandler(new ClickHandler() {
@@ -233,10 +234,11 @@ class PatchSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
       final Button b =
           new Button(Util.M
               .submitPatchSet(detail.getPatchSet().getPatchSetId()));
+      b.setEnabled(false);
 
-      // If the change is included in a topic,  the button should be disabled
-      if(changeDetail.getChange().getTopicId() != null ){
-        b.setEnabled(false);
+      // If the change is not included in a topic,  the button should be enabled
+      if(changeDetail.getChange().getTopicId() == null ){
+        b.setEnabled(true);
       }
 
       b.addClickHandler(new ClickHandler() {