1 files changed, 12 insertions, 0 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 6906cea16d..d1249e9c97 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,6 +199,12 @@ 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()));
+
+      // If the change is included in a topic,  the button should be disabled
+      if(changeDetail.getChange().getTopicId() != null){
+        stagingButton.setEnabled(false);
+      }
+
       stagingButton.addClickHandler(new ClickHandler() {
         @Override
         public void onClick(final ClickEvent event) {
@@ -227,6 +233,12 @@ class PatchSetComplexDisclosurePanel extends CommonComplexDisclosurePanel {
       final Button b =
           new Button(Util.M
               .submitPatchSet(detail.getPatchSet().getPatchSetId()));
+
+      // If the change is included in a topic,  the button should be disabled
+      if(changeDetail.getChange().getTopicId() != null ){
+        b.setEnabled(false);
+      }
+
       b.addClickHandler(new ClickHandler() {
         @Override
         public void onClick(final ClickEvent event) {