diff --git a/libraries/voxels/src/VoxelTreeCommands.cpp b/libraries/voxels/src/VoxelTreeCommands.cpp
index f0f092fd04..75b38667ec 100644
--- a/libraries/voxels/src/VoxelTreeCommands.cpp
+++ b/libraries/voxels/src/VoxelTreeCommands.cpp
@@ -17,8 +17,37 @@ AddVoxelCommand::AddVoxelCommand(VoxelTree* tree, VoxelDetail& voxel, VoxelEditP
     QUndoCommand("Add Voxel", parent),
     _tree(tree),
     _packetSender(packetSender),
-    _voxel(voxel)
+    _voxel(voxel),
+    _oldTree(NULL)
 {
+    VoxelTreeElement* element = _tree->getVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s);
+    if (element) {
+        if (element->hasContent() && element->isLeaf()) {
+            // Do nothing, everything is in order
+        } else {
+            _oldTree = new VoxelTree();
+            _tree->copySubTreeIntoNewTree(element, _oldTree, true);
+        }
+    } else {
+        glm::vec3 point(_voxel.x + _voxel.s / 2.0f,
+                        _voxel.y + _voxel.s / 2.0f,
+                        _voxel.z + _voxel.s / 2.0f);
+        OctreeElement* element = _tree->getElementEnclosingPoint(point, Octree::Lock);
+        if (element) {
+            VoxelTreeElement* node = static_cast<VoxelTreeElement*>(element);
+            _voxel.x = node->getCorner().x;
+            _voxel.y = node->getCorner().y;
+            _voxel.z = node->getCorner().z;
+            _voxel.s = node->getScale();
+            _voxel.red = node->getColor()[0];
+            _voxel.green = node->getColor()[1];
+            _voxel.blue = node->getColor()[2];
+        }
+    }
+}
+
+AddVoxelCommand::~AddVoxelCommand() {
+    delete _oldTree;
 }
 
 void AddVoxelCommand::redo() {
@@ -31,11 +60,17 @@ void AddVoxelCommand::redo() {
 }
 
 void AddVoxelCommand::undo() {
-    if (_tree) {
-        _tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s);
-    }
-    if (_packetSender) {
-        _packetSender->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &_voxel);
+    if (_oldTree) {
+        OctreeElement* element = _tree->getOrCreateChildElementAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s);
+        qDebug() << _voxel.x << " " << _voxel.y << " " << _voxel.z << " " << _voxel.s;
+        _tree->copyFromTreeIntoSubTree(_oldTree, element);
+    } else {
+        if (_tree) {
+            _tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s);
+        }
+        if (_packetSender) {
+            _packetSender->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &_voxel);
+        }
     }
 }
 
@@ -43,24 +78,37 @@ DeleteVoxelCommand::DeleteVoxelCommand(VoxelTree* tree, VoxelDetail& voxel, Voxe
     QUndoCommand("Delete Voxel", parent),
     _tree(tree),
     _packetSender(packetSender),
-    _voxel(voxel)
+    _voxel(voxel),
+    _oldTree(NULL)
 {
 }
 
+DeleteVoxelCommand::~DeleteVoxelCommand() {
+    delete _oldTree;
+}
+
 void DeleteVoxelCommand::redo() {
-    if (_tree) {
-        _tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s);
-    }
-    if (_packetSender) {
-        _packetSender->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &_voxel);
+    if (_oldTree) {
+        
+    } else {
+        if (_tree) {
+            _tree->deleteVoxelAt(_voxel.x, _voxel.y, _voxel.z, _voxel.s);
+        }
+        if (_packetSender) {
+            _packetSender->queueVoxelEditMessages(PacketTypeVoxelErase, 1, &_voxel);
+        }
     }
 }
 
 void DeleteVoxelCommand::undo() {
-    if (_tree) {
-        _tree->createVoxel(_voxel.x, _voxel.y, _voxel.z, _voxel.s, _voxel.red, _voxel.green, _voxel.blue);
+    if (_oldTree) {
+        
+    } else {
+        if (_tree) {
+            _tree->createVoxel(_voxel.x, _voxel.y, _voxel.z, _voxel.s, _voxel.red, _voxel.green, _voxel.blue);
+        }
+        if (_packetSender) {
+            _packetSender->queueVoxelEditMessages(PacketTypeVoxelSet, 1, &_voxel);
+        }
     }
-    if (_packetSender) {
-        _packetSender->queueVoxelEditMessages(PacketTypeVoxelSet, 1, &_voxel);
-    }
-}
+}
\ No newline at end of file
diff --git a/libraries/voxels/src/VoxelTreeCommands.h b/libraries/voxels/src/VoxelTreeCommands.h
index 4f2610577e..c3b23e7201 100644
--- a/libraries/voxels/src/VoxelTreeCommands.h
+++ b/libraries/voxels/src/VoxelTreeCommands.h
@@ -23,6 +23,7 @@ class VoxelTree;
 class AddVoxelCommand : public QUndoCommand {
 public:
     AddVoxelCommand(VoxelTree* tree, VoxelDetail& voxel, VoxelEditPacketSender* packetSender = NULL, QUndoCommand* parent = NULL);
+    ~AddVoxelCommand();
     
     virtual void redo();
     virtual void undo();
@@ -31,11 +32,13 @@ private:
     VoxelTree* _tree;
     VoxelEditPacketSender* _packetSender;
     VoxelDetail _voxel;
+    VoxelTree* _oldTree;
 };
 
 class DeleteVoxelCommand : public QUndoCommand {
 public:
     DeleteVoxelCommand(VoxelTree* tree, VoxelDetail& voxel, VoxelEditPacketSender* packetSender = NULL, QUndoCommand* parent = NULL);
+    ~DeleteVoxelCommand();
     
     virtual void redo();
     virtual void undo();
@@ -44,6 +47,7 @@ private:
     VoxelTree* _tree;
     VoxelEditPacketSender* _packetSender;
     VoxelDetail _voxel;
+    VoxelTree* _oldTree;
 };
 
 #endif // hifi_VoxelTreeCommands_h