diff --git a/build/utils/patterns.js b/build/utils/patterns.js
index 8ce9937f..818372d9 100644
--- a/build/utils/patterns.js
+++ b/build/utils/patterns.js
@@ -52,7 +52,12 @@
       return form.ask({
         message: 'Select an application',
         type: 'list',
-        choices: _.pluck(applications, 'app_name')
+        choices: _.map(applications, function(application) {
+          return {
+            name: application.app_name + " (" + application.device_type + ")",
+            value: application.app_name
+          };
+        })
       });
     });
   };
@@ -63,7 +68,12 @@
         return;
       }
       return resin.models.application.getAll().then(function(applications) {
-        applications = _.pluck(applications, 'app_name');
+        applications = _.map(applications, function(application) {
+          return {
+            name: application.app_name + " (" + application.device_type + ")",
+            value: application.app_name
+          };
+        });
         applications.unshift({
           name: 'Create a new application',
           value: null
diff --git a/lib/utils/patterns.coffee b/lib/utils/patterns.coffee
index e87f0aa4..533060e3 100644
--- a/lib/utils/patterns.coffee
+++ b/lib/utils/patterns.coffee
@@ -35,13 +35,22 @@ exports.selectApplication = (filter) ->
 		return form.ask
 			message: 'Select an application'
 			type: 'list'
-			choices: _.pluck(applications, 'app_name')
+			choices: _.map applications, (application) ->
+				return {
+					name: "#{application.app_name} (#{application.device_type})"
+					value: application.app_name
+				}
 
 exports.selectOrCreateApplication = ->
 	resin.models.application.hasAny().then (hasAnyApplications) ->
 		return if not hasAnyApplications
 		resin.models.application.getAll().then (applications) ->
-			applications = _.pluck(applications, 'app_name')
+			applications = _.map applications, (application) ->
+				return {
+					name: "#{application.app_name} (#{application.device_type})"
+					value: application.app_name
+				}
+
 			applications.unshift
 				name: 'Create a new application'
 				value: null