diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 6f76bb16b9a..69f48d4d8fe 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -16,7 +16,7 @@
           filters: {     
             all: { 
 						  preFilter: function(args) {					  
-								if (isAdmin() || isDomainAdmin())
+								if (isAdmin()) //"listTemplates&templatefilter=all" only works for root-admin, but no domain-admin. Domain-admin is unable to see all templates until listTemplates API supports a new type of templatefilter for domain-admin to see all templates in his domain.
 									return true;
 								else						
 									return false;
@@ -684,7 +684,15 @@
         listView: {
           label: 'ISOs',
           filters: {            
-					  all: { label: 'All' },
+					  all: { 						
+						 preFilter: function(args) {					  
+								if (isAdmin()) //"listIsos&filter=all" only works for root-admin, but no domain-admin. Domain-admin is unable to see all Isos until listIsos API supports a new type of isofilter for domain-admin to see all Isos in his domain.
+									return true;
+								else						
+									return false;
+							},						
+						  label: 'All' 
+						},
 					  mine: { label: 'Mine' },					
             featured: { label: 'Featured' },
             community: { label: 'Community' }