diff --git a/administrator/components/com_media/layouts/toolbar/deletemedia.php b/administrator/components/com_media/layouts/toolbar/deletemedia.php
index 1212587492dea..d58405553ab0c 100644
--- a/administrator/components/com_media/layouts/toolbar/deletemedia.php
+++ b/administrator/components/com_media/layouts/toolbar/deletemedia.php
@@ -10,7 +10,25 @@
 defined('_JEXEC') or die;
 
 $title = JText::_('JTOOLBAR_DELETE');
+JText::script("JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST");
 ?>
-<button onclick="MediaManager.submit('folder.delete')" class="btn btn-small">
+
+<script type="text/javascript">
+(function($){
+
+	// if any media is selected then only allow to submit otherwise show message
+	deleteMedia = function(){
+	 	if ( $('#folderframe').contents().find('input:checked[name="rm[]"]').length == 0){
+		 	alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));
+			return false;
+		 }
+	
+    	 MediaManager.submit('folder.delete');
+	};
+	
+})(jQuery);
+</script>
+
+<button onclick="deleteMedia()" class="btn btn-small">
 	<i class="icon-remove" title="<?php echo $title; ?>"></i> <?php echo $title; ?>
 </button>