diff --git a/src/components/settings_modal/admin_tabs/links_tab.scss b/src/components/settings_modal/admin_tabs/links_tab.scss
index eb56cd9f5..8946ccc0a 100644
--- a/src/components/settings_modal/admin_tabs/links_tab.scss
+++ b/src/components/settings_modal/admin_tabs/links_tab.scss
@@ -23,10 +23,4 @@
       padding: 0;
     }
   }
-
-  .btn-group {
-    .button-default {
-      flex: 0 1 auto;
-    }
-  }
 }
diff --git a/src/components/settings_modal/admin_tabs/media_proxy_tab.vue b/src/components/settings_modal/admin_tabs/media_proxy_tab.vue
index 4420ae2a4..ecc075fb0 100644
--- a/src/components/settings_modal/admin_tabs/media_proxy_tab.vue
+++ b/src/components/settings_modal/admin_tabs/media_proxy_tab.vue
@@ -12,6 +12,12 @@
             <li>
               <StringSetting path=":pleroma.:media_proxy.:base_url" />
             </li>
+            <li>
+              <BooleanSetting path=":pleroma.:media_proxy.:proxy_opts.:redirect_on_failure" />
+            </li>
+            <li>
+              <ListSetting path=":pleroma.:media_proxy.:whitelist" />
+            </li>
           </ul>
         </li>
       </ul>
@@ -80,9 +86,6 @@
               path=":pleroma.:media_proxy.:proxy_opts.:max_read_duration"
             />
           </li>
-          <li>
-            <BooleanSetting path=":pleroma.:media_proxy.:proxy_opts.:redirect_on_failure" />
-          </li>
           <li>
             <GroupSetting path=":pleroma.:media_proxy.:proxy_opts" />
           </li>
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index 0c6e356c4..8fba8b499 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -23,6 +23,7 @@
       class="input string-input"
       :class="{ disabled: shouldBeDisabled }"
       :disabled="shouldBeDisabled"
+      :placeholder="backendDescriptionSuggestions"
       :value="realDraftMode ? draft : state"
       @change="update"
     >
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 7eca3ed16..d00d9ece0 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -41,6 +41,12 @@
       padding: 0 2em;
     }
 
+    .btn-group {
+      .button-default {
+        flex: 0 1 auto;
+      }
+    }
+
     li {
       display: block;
       margin: 0.75em 0;