diff --git a/src/components/dropzone.js b/src/components/dropzone.js
index 18815e2..dea4398 100644
--- a/src/components/dropzone.js
+++ b/src/components/dropzone.js
@@ -19,6 +19,19 @@ const dropzoneTarget = {
     position.x -= dropzoneRect.left;
     position.y -= dropzoneRect.top;
 
+    // Z-Index is one more the top most children
+    let foundZ = props.children.reduce( (maxZ, currentChildren) => {
+      // Is there a simpler way? Is not easy to expose a getter in a Container.create(Component)
+      let widget = currentChildren.props.data;
+      if (widget && widget.z) {
+        if (widget.z > maxZ) {
+          return widget.z;
+        }
+      }
+      return maxZ;
+    }, 0);
+    position.z = foundZ >= 100? foundZ : ++foundZ;
+
     props.onDrop(monitor.getItem(), position);
   }
 };
diff --git a/src/components/widget-factory.js b/src/components/widget-factory.js
index 59c49d6..364562a 100644
--- a/src/components/widget-factory.js
+++ b/src/components/widget-factory.js
@@ -21,7 +21,7 @@ class WidgetFactory {
             height: 100,
             x: position.x,
             y: position.y,
-            z: 0
+            z: position.z
         };
 
         // set type specific properties