diff --git a/frontend/src/Editor/DraggableBox.jsx b/frontend/src/Editor/DraggableBox.jsx
index bc91276a8c..34d816ef45 100644
--- a/frontend/src/Editor/DraggableBox.jsx
+++ b/frontend/src/Editor/DraggableBox.jsx
@@ -78,7 +78,7 @@ export const DraggableBox = function DraggableBox({ id, title, left, top, width,
                             onResizeStop(id, width, height, e, direction, ref, d);
                         }}
                         >
-                        <div role="DraggableBox" style={isResizing ? { opacity: 0.5 } : { opacity: 1 }}>
+                        <div ref={drag} role="DraggableBox" style={isResizing ? { opacity: 0.5 } : { opacity: 1 }}>
 
                             <Box 
                                 component={component} 
diff --git a/frontend/src/Editor/Editor.jsx b/frontend/src/Editor/Editor.jsx
index 54d5bb787d..e66cc4e8d4 100644
--- a/frontend/src/Editor/Editor.jsx
+++ b/frontend/src/Editor/Editor.jsx
@@ -131,13 +131,15 @@ class Editor extends React.Component {
     componentDefinitionChanged = (newDefinition) => { 
         console.log('new component definition', newDefinition);
         console.log('app definition', this.state.appDefinition);
-        debugger
         this.setState( { 
             appDefinition: {
                  ...this.state.appDefinition, 
                  components: {
                     ...this.state.appDefinition.components,
-                    [newDefinition.id]: { component: newDefinition.component } 
+                    [newDefinition.id]: { 
+                        ...this.state.appDefinition.components[newDefinition.id],
+                        component: newDefinition.component 
+                    } 
                  }
             }
         })