diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 76be5f581d..ddcfb670d4 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -315,7 +315,6 @@ def get_desk_sidebar_items(flatten=False):
 	filters = {
 		'restrict_to_domain': ['in', frappe.get_active_domains()],
 		'extends_another_page': 0,
-		'is_standard': 1,
 		'for_user': '',
 		'module': ['not in', blocked_modules]
 	}
diff --git a/frappe/desk/doctype/desk_page/desk_page.js b/frappe/desk/doctype/desk_page/desk_page.js
index 3087a5f5b8..ec8eaaa60b 100644
--- a/frappe/desk/doctype/desk_page/desk_page.js
+++ b/frappe/desk/doctype/desk_page/desk_page.js
@@ -2,16 +2,22 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Desk Page', {
-	setup: function(frm) {
+	refresh: function(frm) {
+		frm.enable_save();
 		frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
 		frm.get_field("extends_another_page").toggle(frappe.boot.developer_mode);
-		if (!frappe.boot.developer_mode || frm.doc.for_user) {
+		frm.get_field("developer_mode_only").toggle(frappe.boot.developer_mode);
+
+		if (frm.doc.for_user) {
+			frm.set_df_property("extends", "read_only", true);
+		}
+
+		if (frm.doc.for_user || frm.doc.is_standard) {
 			frm.trigger('disable_form');
 		}
 	},
 
 	disable_form: function(frm) {
-		frm.set_read_only();
 		frm.fields
 			.filter(field => field.has_input)
 			.forEach(field => {
diff --git a/frappe/desk/doctype/desk_page/desk_page.json b/frappe/desk/doctype/desk_page/desk_page.json
index 0064d7bd28..851eb43b23 100644
--- a/frappe/desk/doctype/desk_page/desk_page.json
+++ b/frappe/desk/doctype/desk_page/desk_page.json
@@ -8,8 +8,8 @@
  "engine": "InnoDB",
  "field_order": [
   "label",
-  "extends",
   "for_user",
+  "extends",
   "module",
   "category",
   "restrict_to_domain",
@@ -170,7 +170,7 @@
    "search_index": 1
   },
   {
-   "depends_on": "eval:doc.extends_another_page == 1",
+   "depends_on": "eval:doc.extends_another_page == 1 || doc.for_user",
    "fieldname": "extends",
    "fieldtype": "Link",
    "in_standard_filter": 1,
@@ -192,7 +192,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-12 16:12:20.708394",
+ "modified": "2020-05-13 19:01:42.041524",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Page",
diff --git a/frappe/desk/doctype/desk_shortcut/desk_shortcut.json b/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
index 9f8990732a..550ea609c8 100644
--- a/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
+++ b/frappe/desk/doctype/desk_shortcut/desk_shortcut.json
@@ -6,9 +6,9 @@
  "engine": "InnoDB",
  "field_order": [
   "type",
-  "label",
-  "column_break_4",
   "link_to",
+  "column_break_4",
+  "label",
   "icon",
   "restrict_to_domain",
   "section_break_5",
@@ -81,13 +81,14 @@
   {
    "fieldname": "label",
    "fieldtype": "Data",
+   "in_list_view": 1,
    "label": "Label",
    "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-04-07 19:04:23.645198",
+ "modified": "2020-05-13 19:26:34.229669",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Shortcut",