diff --git a/src/vs/code/electron-browser/issue/issueReporterMain.ts b/src/vs/code/electron-browser/issue/issueReporterMain.ts
index 4edeea2666a..03f4c565032 100644
--- a/src/vs/code/electron-browser/issue/issueReporterMain.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterMain.ts
@@ -318,18 +318,31 @@ export class IssueReporter extends Disposable {
 			label.addEventListener('click', (e) => {
 				e.stopPropagation();
 
-				// Stop propgagation not working as expected in this case https://bugs.chromium.org/p/chromium/issues/detail?id=809801
-				// preventDefault does prevent outer details tag from toggling, so use that and manually toggle the checkbox
-				e.preventDefault();
 				const containingDiv = (<HTMLLabelElement>e.target).parentElement;
 				const checkbox = <HTMLInputElement>containingDiv.firstElementChild;
 				if (checkbox) {
-					checkbox.checked = !checkbox.checked;
 					this.issueReporterModel.update({ [checkbox.id]: !this.issueReporterModel.getData()[checkbox.id] });
 				}
 			});
 		}
 
+		const showInfoElements = document.getElementsByClassName('showInfo');
+		for (let i = 0; i < showInfoElements.length; i++) {
+			const showInfo = showInfoElements.item(i);
+			showInfo.addEventListener('click', (e) => {
+				const label = (<HTMLDivElement>e.target);
+				const containingElement = label.parentElement.parentElement;
+				const info = containingElement.lastElementChild;
+				if (info.classList.contains('hidden')) {
+					show(info);
+					label.textContent = localize('hide', "hide");
+				} else {
+					hide(info);
+					label.textContent = localize('show', "show");
+				}
+			});
+		}
+
 		this.addEventListener('issue-source', 'change', (event: Event) => {
 			const fileOnExtension = JSON.parse((<HTMLInputElement>event.target).value);
 			this.issueReporterModel.update({ fileOnExtension: fileOnExtension, includeExtensions: !fileOnExtension });
diff --git a/src/vs/code/electron-browser/issue/issueReporterPage.ts b/src/vs/code/electron-browser/issue/issueReporterPage.ts
index 4991cd98b70..af7bfd77a12 100644
--- a/src/vs/code/electron-browser/issue/issueReporterPage.ts
+++ b/src/vs/code/electron-browser/issue/issueReporterPage.ts
@@ -48,89 +48,6 @@ export default (): string => `
 
 	</div>
 
-	<div class="system-info" id="block-container">
-		<div class="block block-system">
-			<details>
-				<summary>${escape(localize('systemInfo', "My System Info"))}
-					<div class="include-data">
-						<input class="sendData" type="checkbox" id="includeSystemInfo" checked/>
-						<label class="caption" for="includeSystemInfo">${escape(localize('sendData', "Send my data"))}</label>
-					</div>
-				</summary>
-				<div class="block-info">
-					<!-- To be dynamically filled -->
-				</div>
-			</details>
-		</div>
-		<div class="block block-process">
-			<details>
-				<summary>${escape(localize('processes', "Currently Running Processes"))}
-					<div class="include-data">
-						<input class="sendData"  type="checkbox" id="includeProcessInfo" checked/>
-						<label class="caption" for="includeProcessInfo">${escape(localize('sendData', "Send my data"))}</label>
-					</div>
-				</summary>
-				<pre class="block-info">
-					<!-- To be dynamically filled -->
-				</pre>
-			</details>
-		</div>
-		<div class="block block-workspace">
-			<details>
-				<summary>${escape(localize('workspaceStats', "My Workspace Stats"))}
-					<div class="include-data">
-						<input class="sendData"  type="checkbox" id="includeWorkspaceInfo" checked/>
-						<label class="caption" for="includeWorkspaceInfo">${escape(localize('sendData', "Send my data"))}</label>
-					</div>
-				</summary>
-				<pre class="block-info">
-					<code>
-						<!-- To be dynamically filled -->
-					</code>
-				</pre>
-			</details>
-		</div>
-		<div class="block block-extensions">
-			<details>
-				<summary>${escape(localize('extensions', "My Extensions"))}
-					<div class="include-data">
-						<input class="sendData"  type="checkbox" id="includeExtensions" checked/>
-						<label class="caption" for="includeExtensions">${escape(localize('sendData', "Send my data"))}</label>
-					</div>
-				</summary>
-				<div class="block-info">
-					<!-- To be dynamically filled -->
-				</div>
-			</details>
-		</div>
-		<div class="block block-searchedExtensions">
-			<details>
-				<summary>${escape(localize('searchedExtensions', "Searched Extensions"))}
-					<div class="include-data">
-						<input class="sendData"  type="checkbox" id="includeSearchedExtensions" checked/>
-						<label class="caption" for="includeSearchedExtensions">${escape(localize('sendData', "Send my data"))}</label>
-					</div>
-				</summary>
-				<div class="block-info">
-					<!-- To be dynamically filled -->
-				</div>
-			</details>
-		</div>
-		<div class="block block-settingsSearchResults">
-			<details>
-				<summary>${escape(localize('settingsSearchDetails', "Settings Search Details"))}
-					<div class="include-data">
-						<input class="sendData"  type="checkbox" id="includeSettingsSearchDetails" checked/>
-						<label class="caption" for="includeSettingsSearchDetails">${escape(localize('sendData', "Send my data"))}</label>
-					</div>
-				</summary>
-				<div class="block-info">
-					<!-- To be dynamically filled -->
-				</div>
-			</details>
-		</div>
-	</div>
-
 	<div class="input-group description-section">
 		<label for="description" id="issue-description-label">
 			<!-- To be dynamically filled -->
@@ -143,5 +60,72 @@ export default (): string => `
 		</div>
 	</div>
 
+	<div class="system-info" id="block-container">
+		<div class="block block-system">
+			<input class="sendData" type="checkbox" id="includeSystemInfo" checked/>
+			<label class="caption" for="includeSystemInfo">${escape(localize({
+		key: 'sendSystemInfo',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the system information']
+	}, "Send my system information ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+		<div class="block block-process">
+			<input class="sendData" type="checkbox" id="includeProcessInfo" checked/>
+			<label class="caption" for="includeProcessInfo">${escape(localize({
+		key: 'sendProcessInfo',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the process info']
+	}, "Send my currently running processes ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<pre class="block-info hidden">
+				<code>
+				<!-- To be dynamically filled -->
+				</code>
+			</pre>
+		</div>
+		<div class="block block-workspace">
+			<input class="sendData" type="checkbox" id="includeWorkspaceInfo" checked/>
+			<label class="caption" for="includeWorkspaceInfo">${escape(localize({
+		key: 'sendWorkspaceInfo',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the workspace information']
+	}, "Send my workspace metadata ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<pre id="systemInfo" class="block-info hidden">
+				<code>
+				<!-- To be dynamically filled -->
+				</code>
+			</pre>
+		</div>
+		<div class="block block-extensions">
+			<input class="sendData" type="checkbox" id="includeExtensions" checked/>
+			<label class="caption" for="includeExtensions">${escape(localize({
+		key: 'sendExtensions',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the enabled extensions list']
+	}, "Send my enabled extensions ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div id="systemInfo" class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+		<div class="block block-searchedExtensions">
+			<input class="sendData" type="checkbox" id="includeSearchedExtensions" checked/>
+			<label class="caption" for="includeSearchedExtensions">${escape(localize({
+		key: 'sendSearchedExtensions',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the searched extensions']
+	}, "Send searched extensions ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+		<div class="block block-settingsSearchResults">
+			<input class="sendData" type="checkbox" id="includeSettingsSearchDetails" checked/>
+			<label class="caption" for="includeSettingsSearchDetails">${escape(localize({
+		key: 'sendSettingsSearchDetails',
+		comment: ['{0} is either "show" or "hide" and is a button to toggle the visibililty of the search details']
+	}, "Send settings search details ({0})")).replace('{0}', `<a href="#" class="showInfo">${escape(localize('show', "show"))}</a>`)}</label>
+			<div class="block-info hidden">
+				<!-- To be dynamically filled -->
+			</div>
+		</div>
+	</div>
+
 	<button id="github-submit-btn" disabled>${escape(localize('loadingData', "Loading data..."))}</button>
 </div>`;
\ No newline at end of file
diff --git a/src/vs/code/electron-browser/issue/media/issueReporter.css b/src/vs/code/electron-browser/issue/media/issueReporter.css
index 7e7217fe2ba..ff907fc88eb 100644
--- a/src/vs/code/electron-browser/issue/media/issueReporter.css
+++ b/src/vs/code/electron-browser/issue/media/issueReporter.css
@@ -21,7 +21,7 @@ th {
 	text-align: inherit;
 }
 td {
-	padding: .75rem;
+	padding: .25rem;
 	vertical-align: top;
 }
 
@@ -111,6 +111,10 @@ body {
 	display: none;
 }
 
+.block {
+	font-size: 12px;
+}
+
 .block .block-info {
 	width: 100%;
 	font-family: 'Menlo', 'Courier New', 'Courier', monospace;
@@ -184,40 +188,17 @@ textarea {
 	margin-top: 1em;
 }
 
-.system-info {
-	margin-bottom: 1.25em;
-}
-
 select, input, textarea {
 	border: 1px solid transparent;
 	margin-top: 10px;
 }
 
-summary {
-	border: 1px solid transparent;
-	padding: 0 10px;
-	margin-bottom: 5px;
-	cursor: pointer;
-}
 
 .validation-error {
 	font-size: 12px;
 	margin-top: 1em;
 }
 
-.include-data {
-	display: inline-block;
-}
-
-.include-data > .caption {
-	display: inline-block;
-	font-size: 12px;
-	cursor: pointer;
-}
-
-.sendData {
-	margin-left: 1em;
-}
 
 input[type="checkbox"] {
 	width: auto;