diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php
index 3a944b320..be0630f8c 100644
--- a/modules/cms/widgets/MediaManager.php
+++ b/modules/cms/widgets/MediaManager.php
@@ -306,16 +306,19 @@ class MediaManager extends WidgetBase
             throw new ApplicationException(Lang::get('cms::lang.asset.invalid_name'));
         }
 
-        if (!$this->validateFileType($newName)) {
-            throw new ApplicationException(Lang::get('cms::lang.media.type_blocked'));
-        }
-
         $originalPath = Input::get('originalPath');
         $originalPath = MediaLibrary::validatePath($originalPath);
         $newPath = dirname($originalPath).'/'.$newName;
         $type = Input::get('type');
 
         if ($type == MediaLibraryItem::TYPE_FILE) {
+            /*
+             * Validate extension
+             */
+            if (!$this->validateFileType($newName)) {
+                throw new ApplicationException(Lang::get('cms::lang.media.type_blocked'));
+            }
+
             /*
              * Move single file
              */
@@ -352,10 +355,6 @@ class MediaManager extends WidgetBase
             throw new ApplicationException(Lang::get('cms::lang.asset.invalid_name'));
         }
 
-        if (!$this->validateFileType($name)) {
-            throw new ApplicationException(Lang::get('cms::lang.media.type_blocked'));
-        }
-
         $path = Input::get('path');
         $path = MediaLibrary::validatePath($path);