--- a/devtools/client/shared/components/tabs/TabBar.js
+++ b/devtools/client/shared/components/tabs/TabBar.js
@@ -194,21 +194,21 @@ class Tabbar extends Component {
     return this.state.tabs[this.state.activeTab].id;
   }
 
   // Event Handlers
 
   onTabChanged(index) {
     this.setState({
       activeTab: index
+    }, () => {
+      if (this.props.onSelect) {
+        this.props.onSelect(this.state.tabs[index].id);
+      }
     });
-
-    if (this.props.onSelect) {
-      this.props.onSelect(this.state.tabs[index].id);
-    }
   }
 
   onAllTabsMenuClick(event) {
     let menu = new Menu();
     let target = event.target;
 
     // Generate list of menu items from the list of tabs.
     this.state.tabs.forEach((tab) => {