diff --git a/app/src/main/res/layout/dialog_settings.xml b/app/src/main/res/layout/dialog_settings.xml
index a077121..2b35f8c 100644
--- a/app/src/main/res/layout/dialog_settings.xml
+++ b/app/src/main/res/layout/dialog_settings.xml
@@ -8,11 +8,17 @@
     android:paddingEnd="24dp"
     android:paddingBottom="8dp">
 
-    <FrameLayout
-        android:id="@+id/settingsFragmentContainer"
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="320dp" />
+        android:fillViewport="true">
+
+        <FrameLayout
+            android:id="@+id/settingsFragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="320dp" />
+    </ScrollView>
 
     <ProgressBar
         android:id="@+id/settingsApplyProgress"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f6da80..131423f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -94,6 +94,7 @@
     <string name="settings_theme_title">Theme</string>
     <string name="settings_base_url_title">Base URL</string>
     <string name="settings_api_key_title">API key</string>
+    <string name="settings_api_key_summary_masked">Stored securely</string>
     <string name="settings_save_and_close">Save and close</string>
 
     <string-array name="settings_theme_entries">
diff --git a/app/src/main/res/xml/settings_preferences.xml b/app/src/main/res/xml/settings_preferences.xml
index d3d6a46..08e49b2 100644
--- a/app/src/main/res/xml/settings_preferences.xml
+++ b/app/src/main/res/xml/settings_preferences.xml
@@ -17,7 +17,9 @@
 
     <EditTextPreference
         android:key="pref_api_key_draft"
+        android:inputType="textPassword"
+        android:summary="@string/settings_api_key_summary_masked"
         android:title="@string/settings_api_key_title"
-        app:useSimpleSummaryProvider="true" />
+        app:useSimpleSummaryProvider="false" />
 
 </PreferenceScreen>