diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 4d1a138a68..4038580fd5 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -541,6 +541,8 @@ export default {
     clearCanvas() {
       this.$store.commit('setComponentData', [])
       this.$store.commit('recordSnapshot', 'clearCanvas')
+      bus.$emit('change_panel_right_draw', false)
+      this.$store.commit('setCurComponent', { component: null, index: null })
     },
 
     handlePreviewChange() {