diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index f3c1b4b68f..72020c4b1f 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -1152,10 +1152,10 @@
 			if (is_dir($template_dir) && is_array($device_vendors)) {
 				foreach($device_vendors as $row) {
 					echo "		<optgroup label='".escape($row["name"])."'>\n";
-					$templates = scandir($template_dir.'/'.$row["name"]);
-					foreach($templates as $dir) {
-						if ($file != "." && $dir != ".." && $dir[0] != '.') {
-							if (is_dir($template_dir . '/' . $row["name"] .'/'. $dir)) {
+					if (is_dir($template_dir.'/'.$row["name"])) {
+						$templates = scandir($template_dir.'/'.$row["name"]);
+						foreach($templates as $dir) {
+							if ($file != "." && $dir != ".." && $dir[0] != '.' && is_dir($template_dir.'/'.$row["name"].'/'.$dir)) {
 								if ($device_template == $row["name"]."/".$dir) {
 									echo "			<option value='".escape($row["name"])."/".escape($dir)."' selected='selected'>".escape($row["name"])."/".escape($dir)."</option>\n";
 								}