diff --git a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
index af034ca0f..c2c215ef7 100644
--- a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
+++ b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
@@ -112,8 +112,9 @@ function bb_merge_bottom_branch_to_here()
     eval $cmd
     git mergetool --no-prompt
     if [[ $? == 0 ]]; then
-        git gui
+        git gui citool
     fi
+    echo "Use 'bb_push_with_care' to push your merge to Gerrit"
 }