3 files changed, 8 insertions, 11 deletions
diff --git a/pages/options.coffee b/pages/options.coffee
index 110f869c..c8c21850 100644
--- a/pages/options.coffee
+++ b/pages/options.coffee
@@ -206,14 +206,13 @@ initOptionsPage = ->
       (event) ->
         if advancedMode
           $("advancedOptions").style.display = "none"
-          $("advancedOptionsLink").innerHTML = "Show advanced options&hellip;"
+          $("advancedOptionsButton").innerHTML = "Show Advanced Options"
         else
           $("advancedOptions").style.display = "table-row-group"
-          $("advancedOptionsLink").innerHTML = "Hide advanced options"
+          $("advancedOptionsButton").innerHTML = "Hide Advanced Options"
         advancedMode = !advancedMode
+        $("advancedOptionsButton").blur()
         event.preventDefault()
-        # Prevent the "advanced options" link from retaining the focus.
-        document.activeElement.blur()
 
   activateHelpDialog = ->
     showHelpDialog chrome.extension.getBackgroundPage().helpDialogHtml(true, true, "Command Listing"), frameId
@@ -226,7 +225,7 @@ initOptionsPage = ->
     $("saveOptions").innerHTML = "No Changes"
 
   $("saveOptions").addEventListener "click", saveOptions
-  $("advancedOptionsLink").addEventListener "click", toggleAdvancedOptions
+  $("advancedOptionsButton").addEventListener "click", toggleAdvancedOptions
   $("showCommands").addEventListener "click", activateHelpDialog
   $("filterLinkHints").addEventListener "click", maintainLinkHintsView
 
diff --git a/pages/options.css b/pages/options.css
index 1a3ff757..ffb348c6 100644
--- a/pages/options.css
+++ b/pages/options.css
@@ -137,7 +137,7 @@ input#searchUrl {
 }
 #buttonsPanel { width: 100%; }
 #advancedOptions { display: none; }
-#advancedOptionsLink { line-height: 24px; }
+#advancedOptionsButton { width: 170px; }
 .help {
   position: absolute;
   right: -320px;
diff --git a/pages/options.html b/pages/options.html
index 67e2b16d..b14c454f 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -67,9 +67,6 @@ b: http://b.com/?q=%s description
               <textarea id="searchEngines"></textarea>
           </td>
         </tr>
-        <tr>
-           <td colspan="2"><a href="#" id="advancedOptionsLink">Show advanced options&hellip;</a></td>
-        </tr>
         <tbody id='advancedOptions'>
           <tr>
             <td colspan="2"><header>Advanced Options</header></td>
@@ -280,12 +277,13 @@ b: http://b.com/?q=%s description
           <tr>
             <td id="footerTableData">
               <span id="helpText">
-                Type <strong>?</strong> to show the Vimium help dialog.
+                Type <strong>?</strong> to show the help dialog.
                 <br/>
                 Type <strong>Ctrl-Enter</strong> to save <i>all</i> options.
               </span>
             </td>
-            <td id="saveOptionsTableData">
+            <td id="saveOptionsTableData" nowrap>
+              <button id="advancedOptionsButton">Show Advanced Options</button>
               <button id="saveOptions" disabled="true">No Changes</button>
             </td>
           </tr>