diff --git a/module/doc/model.php b/module/doc/model.php
index 425dee439f..3d7424e651 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -622,6 +622,12 @@ class docModel extends model
     public function update($docID)
     {
         $oldDoc = $this->dao->select('*')->from(TABLE_DOC)->where('id')->eq((int)$docID)->fetch();
+        if(!empty($_POST['editedDate']) and $oldDoc->editedDate != $this->post->editedDate)
+        {
+            dao::$errors[] = $this->lang->error->editedByOther;
+            return false;
+        }
+
         $now = helper::now();
         $doc = fixer::input('post')->setDefault('module', 0)
             ->stripTags($this->config->doc->editor->edit['id'], $this->config->allowedTags)
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index ac1c39251f..db0a53996f 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -74,7 +74,11 @@
         </tr>
         <tr>
           <td colspan='3' class='text-center form-actions'>
-            <?php echo html::submitButton('', '', 'btn btn-wide btn-primary') . ' ' . html::backButton('', '', 'btn btn-wide');?>
+            <?php
+            echo html::hidden('editedDate', $doc->editedDate);
+            echo html::submitButton('', '', 'btn btn-wide btn-primary');
+            echo html::backButton('', '', 'btn btn-wide');
+            ?>
           </td>
         </tr>
       </table>