diff --git a/ChangeLog b/ChangeLog
index 733d4f947d..1729485938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4336 List server css style wrong
 - bug       Missing value on the Status > Server page
 - bug #4347 Fixed PHP Parse error in Advisor
+- bug #4350 Deleting the DB if it is renamed by the same name
 
 4.1.12.0 (2014-03-27)
 - bug #4334 Add event : datepicker won't open
diff --git a/js/db_operations.js b/js/db_operations.js
index 763040bc4f..a0e0dcd1fd 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -35,9 +35,17 @@ AJAX.registerOnload('db_operations.js', function () {
     $("#rename_db_form.ajax").live('submit', function (event) {
         event.preventDefault();
 
+        var old_db_name = PMA_commonParams.get('db');
+        var new_db_name = $('#new_db_name').val();
+
+        if (new_db_name == old_db_name) {
+            PMA_ajaxShowMessage(PMA_messages.strDropDatabaseStrongWarning);
+            return false;
+        }
+
         var $form = $(this);
 
-        var question = escapeHtml('CREATE DATABASE ' + $('#new_db_name').val() + ' / DROP DATABASE ' + PMA_commonParams.get('db'));
+        var question = escapeHtml('CREATE DATABASE ' + new_db_name + ' / DROP DATABASE ' + old_db_name);
 
         PMA_prepareForAjaxRequest($form);