Merge change 21933 into eclair

* changes:
  Fix a bug where we were opening a new tab unnecessarily.