diff --git a/www/datastore/Content.js b/www/datastore/Content.js
index 87317ec1..fa0b7d2c 100644
--- a/www/datastore/Content.js
+++ b/www/datastore/Content.js
@@ -479,6 +479,7 @@ Ext.define('PBS.DataStoreContent', {
 			ns,
 			dryrun: true,
 			canRecurse: true,
+			isCreate: true,
 		    },
 		],
 	    });
diff --git a/www/panel/PrunePanel.js b/www/panel/PrunePanel.js
index 59c28a8e..7ccdb1de 100644
--- a/www/panel/PrunePanel.js
+++ b/www/panel/PrunePanel.js
@@ -27,7 +27,7 @@ Ext.define('PBS.panel.PruneInputPanel', {
 	if (me.ns && me.ns !== '') {
 	    values.ns = me.ns;
 	}
-	if (!values.recursive) {
+	if (!values.recursive && me.canRecurse) {
 	    values['max-depth'] = 0;
 	}
 	delete values.recursive;
diff --git a/www/window/PruneJobEdit.js b/www/window/PruneJobEdit.js
index b2259bb9..b804fdb4 100644
--- a/www/window/PruneJobEdit.js
+++ b/www/window/PruneJobEdit.js
@@ -105,7 +105,9 @@ Ext.define('PBS.window.PruneJobEdit', {
 		xtype: 'pbsNamespaceMaxDepthReduced',
 		name: 'max-depth',
 		fieldLabel: gettext('Max. Depth'),
-		deleteEmpty: true,
+		cbind: {
+		    deleteEmpty: '{!isCreate}',
+		},
 	    },
 	],
 
@@ -133,6 +135,9 @@ Ext.define('PBS.window.PruneJobEdit', {
 	columnB: [
 	    {
 		xtype: 'pbsPruneInputPanel',
+		cbind: {
+		    isCreate: '{isCreate}',
+		},
 		getValues: () => ({}), // let that handle our inputpanel here
 	    },
 	    {