diff --git a/public/res/extensions/toc.js b/public/res/extensions/toc.js
index d6cda052..eb213074 100644
--- a/public/res/extensions/toc.js
+++ b/public/res/extensions/toc.js
@@ -116,10 +116,10 @@ define([
 
     toc.onPagedownConfigure = function(editor) {
         previewContentsElt = document.getElementById('preview-contents');
-        var tocEltList = document.querySelectorAll('.table-of-contents');
         var tocExp = new RegExp("^" + toc.config.marker + "$", "g");
         // Run TOC generation when conversion is finished directly on HTML
         editor.hooks.chain("onPreviewRefresh", function() {
+            var tocEltList = document.querySelectorAll('.table-of-contents, .toc');
             var htmlToc = buildToc();
             // Replace toc paragraphs
             _.each(previewContentsElt.getElementsByTagName('p'), function(elt) {
diff --git a/public/res/html/settingsExtensionsAccordion.html b/public/res/html/settingsExtensionsAccordion.html
index 6f60e0fd..ff2321ac 100644
--- a/public/res/html/settingsExtensionsAccordion.html
+++ b/public/res/html/settingsExtensionsAccordion.html
@@ -6,9 +6,9 @@
 				enabled
 			</label>
 		</div>
-		<span data-toggle="collapse" data-parent=".accordion-extensions"
+		<a data-toggle="collapse" data-parent=".accordion-extensions"
 			class="accordion-toggle" href="#accordion-extensions-collapse-<%= extensionId %>">
-			<%= extensionName %> </span>
+			<%= extensionName %> </a>
 	</div>
 	<div id="accordion-extensions-collapse-<%= extensionId %>" class="collapse">
 		<div class="accordion-inner clearfix"><%= settingsBlock %></div>
diff --git a/public/res/styles/main.less b/public/res/styles/main.less
index 48dc19d1..e3955838 100644
--- a/public/res/styles/main.less
+++ b/public/res/styles/main.less
@@ -686,15 +686,6 @@ a {
 	
 	.accordion-heading {
 		padding: 12px 15px;
-		.accordion-toggle {
-			display: inline;
-			padding: 0;
-			font-weight: bold;
-			cursor: pointer;
-			&:hover {
-				text-decoration: underline;
-			}
-		}
 		.checkbox {
 			margin-top: 0;
 			margin-bottom: 0;