diff --git a/src/components/gui/gui.jsx b/src/components/gui/gui.jsx
index 37a66c308ddfbf10a1403ec63991372b88546ec7..37feae6346252632a3d196b9ce0b3453bca78223 100644
--- a/src/components/gui/gui.jsx
+++ b/src/components/gui/gui.jsx
@@ -54,6 +54,9 @@ const GUIComponent = props => {
         loading,
         onExtensionButtonClick,
         onActivateTab,
+        onActivateCostumesTab,
+        onActivateSoundsTab,
+        onActivateBlocksTab,
         previewInfoVisible,
         soundsTabVisible,
         vm,
@@ -113,7 +116,10 @@ const GUIComponent = props => {
                             onSelect={onActivateTab}
                         >
                             <TabList className={tabClassNames.tabList}>
-                                <Tab className={tabClassNames.tab}>
+                                <Tab
+                                    className={tabClassNames.tab}
+                                    onClick={onActivateBlocksTab}
+                                >
                                     <img
                                         draggable={false}
                                         src={codeIcon}
@@ -124,7 +130,10 @@ const GUIComponent = props => {
                                         id="gui.gui.codeTab"
                                     />
                                 </Tab>
-                                <Tab className={tabClassNames.tab}>
+                                <Tab
+                                    className={tabClassNames.tab}
+                                    onClick={onActivateCostumesTab}
+                                >
                                     <img
                                         draggable={false}
                                         src={costumesIcon}
@@ -135,7 +144,10 @@ const GUIComponent = props => {
                                         id="gui.gui.costumesTab"
                                     />
                                 </Tab>
-                                <Tab className={tabClassNames.tab}>
+                                <Tab
+                                    className={tabClassNames.tab}
+                                    onClick={onActivateSoundsTab}
+                                >
                                     <img
                                         draggable={false}
                                         src={soundsIcon}
@@ -221,6 +233,9 @@ GUIComponent.propTypes = {
     intl: intlShape.isRequired,
     loading: PropTypes.bool,
     onActivateTab: PropTypes.func,
+    onActivateBlocksTab: PropTypes.func,
+    onActivateCostumesTab: PropTypes.func,
+    onActivateSoundsTab: PropTypes.func,
     onExtensionButtonClick: PropTypes.func,
     onTabSelect: PropTypes.func,
     previewInfoVisible: PropTypes.bool,
diff --git a/src/containers/gui.jsx b/src/containers/gui.jsx
index 85b3a7acd224798d8ddd94bb42ca9bc1ea95e156..3c2d2ddcf2b3aadf046967f61fc2efe9fbf62097 100644
--- a/src/containers/gui.jsx
+++ b/src/containers/gui.jsx
@@ -107,7 +107,10 @@ const mapStateToProps = state => ({
 
 const mapDispatchToProps = dispatch => ({
     onExtensionButtonClick: () => dispatch(openExtensionLibrary()),
-    onActivateTab: tab => dispatch(activateTab(tab))
+    onActivateTab: tab => dispatch(activateTab(tab)),
+    onActivateBlocksTab: () => dispatch(activateTab(BLOCKS_TAB_INDEX)),
+    onActivateCostumesTab: () => dispatch(activateTab(COSTUMES_TAB_INDEX)),
+    onActivateSoundsTab: () => dispatch(activateTab(SOUNDS_TAB_INDEX))
 });
 
 const ConnectedGUI = connect(