diff --git a/airtime_mvc/application/views/scripts/playouthistory/template-contents.phtml b/airtime_mvc/application/views/scripts/playouthistory/template-contents.phtml
index 8400933df..3beb495dd 100644
--- a/airtime_mvc/application/views/scripts/playouthistory/template-contents.phtml
+++ b/airtime_mvc/application/views/scripts/playouthistory/template-contents.phtml
@@ -11,11 +11,17 @@
   </label>
 </div>
 
-<?php $i = 0; ?>
+<?php $i = 0; 
+	$usedFileMD = array();
+?>
 
 <ul class="template_item_list">
   <?php foreach ($this->template_fields as $field): ?>
 
+    <?php if($field["isFileMd"]) {
+    	$usedFileMD[] = $field["name"];
+    } ?>
+    
   <li id="<?php echo "field_".$i?>"
   	data-id="<?php echo isset($field["id"]) ? $field["id"] : ""; ?>"
   	data-name="<?php echo $field["name"]?>"
@@ -40,6 +46,10 @@
 <ul class="template_file_md">
   <?php foreach ($this->fileMD as $md): ?>
 
+  <?php if(in_array($md["name"], $usedFileMD)) {
+      continue;
+  } ?>
+  
   <li id="<?php echo "md_".$md["name"]?>"
   	data-name="<?php echo $md["name"]?>"
   	data-type="<?php echo $md["type"]?>"
diff --git a/airtime_mvc/public/js/airtime/playouthistory/configuretemplate.js b/airtime_mvc/public/js/airtime/playouthistory/configuretemplate.js
index 0fc00acd9..f6bc6fdb4 100644
--- a/airtime_mvc/public/js/airtime/playouthistory/configuretemplate.js
+++ b/airtime_mvc/public/js/airtime/playouthistory/configuretemplate.js
@@ -89,7 +89,8 @@ var AIRTIME = (function(AIRTIME) {
 				required: false
     		};
 			
-			 addField(config);
+			addField(config);
+			$li.remove();
     	});
     	
     	$templateList.sortable();