diff --git a/apps/filemanager/handlers/index.php b/apps/filemanager/handlers/index.php
index 9df97c3f0..808b200a0 100644
--- a/apps/filemanager/handlers/index.php
+++ b/apps/filemanager/handlers/index.php
@@ -64,7 +64,8 @@
 	'Are you sure you want to delete this folder and all of its contents?',
 	'Your browser does not support drag and drop file uploads.',
 	'Please upload fewer files at a time.',
-	'The following file is too large to upload'
+	'The following file is too large to upload',
+	'Overwrite existing file?'
 ));
 
 echo $tpl->render ('filemanager/index', $o);
diff --git a/apps/filemanager/handlers/upload.php b/apps/filemanager/handlers/upload.php
index 780ea4ce4..a77e8e673 100644
--- a/apps/filemanager/handlers/upload.php
+++ b/apps/filemanager/handlers/upload.php
@@ -50,12 +50,6 @@
 
 for ($i = 0; $i < count ($_FILES['file']['name']); $i++) {
 	$_FILES['file']['name'][$i] = trim (urldecode ($_FILES['file']['name'][$i]));
-	if (@file_exists ($root . $_POST['path'] . '/' . $_FILES['file']['name'][$i])) {
-		$page->title = __ ('File Already Exists') . ': ' . $_FILES['file']['name'][$i];
-		echo '<p>' . __ ('A file by that name already exists.') . '</p>';
-		echo '<p><a href="/filemanager">' . __ ('Back') . '</a></p>';
-		return;
-	}
 	if (strpos ($_FILES['file']['name'][$i], '..') !== false) {
 		$page->title = __ ('Invalid File Name') . ': ' . $_FILES['file']['name'][$i];
 		echo '<p>' . __ ('The file name contains invalid characters.') . '</p>';
diff --git a/apps/filemanager/handlers/upload/drop.php b/apps/filemanager/handlers/upload/drop.php
index f5119b947..d5ffac0fa 100644
--- a/apps/filemanager/handlers/upload/drop.php
+++ b/apps/filemanager/handlers/upload/drop.php
@@ -52,10 +52,6 @@
 	return;
 }
 
-if (@file_exists ($root . $_POST['path'] . '/' . $_FILES['file']['name'])) {
-	echo json_encode (array ('success' => false, 'error' => __ ('A file by that name already exists.')));
-	return;
-}
 if (strpos ($_FILES['file']['name'], '..') !== false) {
 	echo json_encode (array ('success' => false, 'error' => __ ('The file name contains invalid characters.')));
 	return;