diff --git a/src/views/apps.html b/src/views/apps.html
index d836cd3e0..785cf1950 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -99,6 +99,11 @@
                                     <br/>
                                 </div>
 
+                                <div class="form-group">
+                                  <label class="control-label">Tags</label>
+                                  <tag-input class="form-control" placeholder="Add tags" taglist="appConfigure.tags" name="tags" uib-tooltip="For grouping in the dashboard"></tag-input>
+                                </div>
+
                             </uib-tab>
 
                             <uib-tab index="'advanced'" heading="Advanced">
diff --git a/src/views/apps.js b/src/views/apps.js
index e06cbd0f8..6fecb69a2 100644
--- a/src/views/apps.js
+++ b/src/views/apps.js
@@ -56,6 +56,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
         alternateSubdomain: '',
         alternateDomain: null,
         ssoAuth: false,
+        tags: '',
 
         action: 'general',
 
@@ -126,6 +127,9 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                 }
             }
 
+            // translate for tag-input
+            $scope.appConfigure.tags = app.tags ? app.tags.join(',') : '';
+
             $('#appConfigureModal').modal('show');
         },
 
@@ -166,6 +170,7 @@ angular.module('Application').controller('AppsController', ['$scope', '$location
                 enableBackup: $scope.appConfigure.enableBackup,
                 enableAutomaticUpdate: $scope.appConfigure.enableAutomaticUpdate,
                 alternateDomains: [],
+                tags: $scope.appConfigure.tags.split(','),
                 dataDir: $scope.appConfigure.dataDirEnabled ? $scope.appConfigure.dataDir : ''
             };