diff --git a/ext/src/ui/options/index.tsx b/ext/src/ui/options/index.tsx
index 143a60f..bef4ab6 100644
--- a/ext/src/ui/options/index.tsx
+++ b/ext/src/ui/options/index.tsx
@@ -174,6 +174,11 @@ class OptionsApp extends Component<{}, OptionsAppState> {
                         onSubmit={ this.handleFormSubmit }
                         onChange={ this.handleFormChange }>
 
+                    <Bridge info={ this.state.bridgeInfo }
+                            loading={ this.state.bridgeLoading }
+                            options={ this.state.options }
+                            onChange={ this.handleInputChange } />
+
                     <fieldset className="category">
                         <legend className="category__name">
                             <h2>{ _("optionsMediaCategoryName") }</h2>
@@ -432,12 +437,6 @@ class OptionsApp extends Component<{}, OptionsAppState> {
                             { _("optionsSave") }
                         </button>
                     </div>
-
-                    { // Workaround for form default button }
-                    <Bridge info={ this.state.bridgeInfo }
-                            loading={ this.state.bridgeLoading }
-                            options={ this.state.options }
-                            onChange={ this.handleInputChange } /> }
                 </form>
 
                 <details className="about">
diff --git a/ext/src/ui/options/styles/index.css b/ext/src/ui/options/styles/index.css
index 44f2862..8477cf1 100644
--- a/ext/src/ui/options/styles/index.css
+++ b/ext/src/ui/options/styles/index.css
@@ -242,8 +242,8 @@ button.ghost:not(:hover) {
     color: var(--secondary-color);
 }
 
-#form > .category:not(:first-child) {
-    border-top: 1px solid var(--border-color);
+#form > .category {
+    border-bottom: 1px solid var(--border-color);
 }