diff --git a/src/views/app.html b/src/views/app.html
index 0eb7f669e..471f48206 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -962,9 +962,20 @@
             <label class="control-label">{{ 'app.storage.appdata.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#data-directory" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
             <p ng-bind-html="'app.storage.appdata.description' | tr:{ storagePath: ('/home/yellowtent/appsdata/' + app.id) }"></p>
             <form role="form" name="storageDataDirForm" ng-submit="storage.submitDataDir()" autocomplete="off">
-              <div class="form-group" ng-class="{ 'has-error': storageDataDirForm.$dirty && storage.error.dataDir }">
-                <div ng-show="storage.error.dataDir">{{ storage.error.dataDir }}</div>
+              <select class="form-control" ng-model="storage.location" ng-options="location.displayName for location in storage.locationOptions track by location.id"></select>
+
+              <br/>
+
+              <div class="form-group" ng-show="storage.location.type === 'custom'" ng-class="{ 'has-error': storageDataDirForm.$dirty && storage.error.dataDir }">
+                <label class="control-label">Folder Path</label>
                 <input type="text" class="form-control" name="dataDir" placeholder="{{ 'app.storage.appdata.dataDirPlaceholder' | tr }}" ng-model="storage.dataDir">
+                <div ng-show="storage.error.dataDir">{{ storage.error.dataDir }}</div>
+              </div>
+
+              <div class="form-group" ng-show="storage.location.type === 'volume'" ng-class="{ 'has-error': storageDataDirForm.$dirty && storage.error.dataPrefix }">
+                <label class="control-label">Folder Prefix</label>
+                <input type="text" class="form-control" name="dataPrefix" placeholder="Prefix within the Volume" ng-model="storage.dataPrefix">
+                <div ng-show="storage.error.dataPrefix">{{ storage.error.dataPrefix }}</div>
               </div>
 
               <input class="ng-hide" type="submit" ng-disabled="!storageDataDirForm.$dirty || storageDataDirForm.$invalid || storage.busyDataDir"/>
diff --git a/src/views/app.js b/src/views/app.js
index ceaeef956..1b4293327 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -681,6 +681,16 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         busyDataDir: false,
         dataDir: null,
 
+        dataPrefix: '',
+
+        location: {
+            id: '', // default, custom, volume+<volumeid>
+            type: '', // default, custom, volume
+            value: '' // emtpy, path, volumeId
+        },
+
+        locationOptions: [],
+
         busyBinds: false,
         mounts: [], // { volume, readOnly }
 
@@ -691,6 +701,23 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
             $scope.storage.dataDir = app.dataDir;
             $scope.storage.mounts = [];
 
+            $scope.storage.locationOptions = [
+                { id: 'default', type: 'default', value: '', displayName: 'Default - /home/yellowtent/appsdata/<appid>' },
+                { id: 'custom', type: 'custom', value: app.dataDir, displayName: 'Custom Folder Path' }
+            ];
+
+            $scope.volumes.forEach(function (volume) {
+                $scope.storage.locationOptions.push({ id: 'volume-'+volume.id, type: 'volume', value: volume.id, displayName: 'Volume - ' + volume.name });
+            });
+
+            if (!app.dataDir) {
+                $scope.storage.location = { id: 'default', type: 'default', value: '' };
+            } else if (app.dataDir) {
+                $scope.storage.location = { id: 'custom', type: 'custom', value: app.dataDir };
+            } else {
+                // TODO how to determine volume is used?
+            }
+
             app.mounts.forEach(function (mount) { // { volumeId, readOnly }
                 var volume = $scope.volumes.find(function (v) { return v.id === mount.volumeId; });
                 $scope.storage.mounts.push({ volume: volume, readOnly: mount.readOnly });