diff --git a/frappe/integrations/doctype/google_settings/google_settings.json b/frappe/integrations/doctype/google_settings/google_settings.json
index 6a4f181f2d..ea7394aafb 100644
--- a/frappe/integrations/doctype/google_settings/google_settings.json
+++ b/frappe/integrations/doctype/google_settings/google_settings.json
@@ -10,6 +10,8 @@
   "client_secret",
   "sb_01",
   "api_key",
+  "section_break_7",
+  "google_drive_picker_enabled",
   "app_id"
  ],
  "fields": [
@@ -20,10 +22,12 @@
    "label": "Enable"
   },
   {
+   "description": "The Client ID obtained from the Google Cloud Console under \"APIs & Services\" > \"Credentials\".",
    "fieldname": "client_id",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Client ID"
+   "label": "Client ID",
+   "mandatory_depends_on": "google_drive_picker_enabled"
   },
   {
    "fieldname": "client_secret",
@@ -32,10 +36,11 @@
    "label": "Client Secret"
   },
   {
-   "description": "Used For Google Maps Integration.",
+   "description": "The browser API key obtained from the Google Cloud Console under \"APIs & Services\" > \"Credentials\".",
    "fieldname": "api_key",
    "fieldtype": "Data",
-   "label": "API Key"
+   "label": "API Key",
+   "mandatory_depends_on": "google_drive_picker_enabled"
   },
   {
    "depends_on": "enable",
@@ -50,14 +55,28 @@
    "label": "API Key"
   },
   {
+   "depends_on": "google_drive_picker_enabled",
+   "description": "The project number obtained from Google Cloud Console under \"IAM & Admin\" > \"Settings\".\n\n",
    "fieldname": "app_id",
    "fieldtype": "Data",
-   "label": "App ID"
+   "label": "App ID",
+   "mandatory_depends_on": "google_drive_picker_enabled"
+  },
+  {
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break",
+   "label": "Google Drive Picker"
+  },
+  {
+   "default": "0",
+   "fieldname": "google_drive_picker_enabled",
+   "fieldtype": "Check",
+   "label": "Google Drive Picker Enabled"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2021-03-28 22:24:05.963403",
+ "modified": "2021-03-30 14:29:15.132565",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Google Settings",
diff --git a/frappe/integrations/doctype/google_settings/google_settings.py b/frappe/integrations/doctype/google_settings/google_settings.py
index bd0e845977..adeb361f56 100644
--- a/frappe/integrations/doctype/google_settings/google_settings.py
+++ b/frappe/integrations/doctype/google_settings/google_settings.py
@@ -20,7 +20,7 @@ def get_file_picker_settings():
 		return {'enabled': False}
 
 	google_settings = frappe.get_single("Google Settings")
-	if not google_settings.enable:
+	if not (google_settings.enable and google_settings.google_drive_picker_enabled):
 		return {'enabled': False}
 
 	return {