diff --git a/html/pages/device/edit/apps.inc.php b/html/pages/device/edit/apps.inc.php
index 03b0ca5f48..cac2468608 100644
--- a/html/pages/device/edit/apps.inc.php
+++ b/html/pages/device/edit/apps.inc.php
@@ -2,14 +2,10 @@
 <?php
 
 // Load our list of available applications
-if ($handle = opendir($config['install_dir'].'/includes/polling/applications/')) {
-    while (false !== ($file = readdir($handle))) {
-        if ($file != '.' && $file != '..' && strstr($file, '.inc.php')) {
-            $applications[] = str_replace('.inc.php', '', $file);
-        }
+foreach (scandir($config['install_dir'].'/includes/polling/applications/') as $file) {
+    if (substr($file, -8) == '.inc.php') {
+        $applications[] = substr($file, 0, -8);
     }
-
-    closedir($handle);
 }
 
 // Check if the form was POSTed