diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index 838f70f468..9073df589c 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -221,6 +221,10 @@ class Editor extends React.Component {
   };
 
   switchSidebarTab = (tabIndex) => {
+    if (tabIndex == 2)
+    {
+      this.setState({ selectedComponent: null });
+    }
     this.setState({
       currentSidebarTab: tabIndex
     });