diff --git a/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java b/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java
index f059e52d..f7717a86 100644
--- a/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/PreferencesActivity.java
@@ -2,6 +2,7 @@ package me.impy.aegis.ui;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.widget.Toast;
@@ -91,6 +92,16 @@ public class PreferencesActivity extends AegisActivity {
                 }
             });
 
+            EditTextPreference timeoutPreference = (EditTextPreference) findPreference("pref_timeout");
+            timeoutPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    preference.setSummary(String.format(getString(R.string.pref_timeout_summary), (String) newValue));
+                    return true;
+                }
+            });
+            timeoutPreference.getOnPreferenceChangeListener().onPreferenceChange(timeoutPreference, timeoutPreference.getText());
+
             Preference issuerPreference = findPreference("pref_issuer");
             issuerPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5bad2312..94afbe47 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,11 +6,20 @@
     <string name="discard">Discard</string>
     <string name="save">Save</string>
     <string name="title_activity_intro">IntroActivity</string>
+
     <string name="settings">Preferences</string>
-    <string name="pref_night_mode">Night mode</string>
-    <string name="pref_night_mode_description">Enable this to use darker colors</string>
-    <string name="pref_issuers">Show the issuer</string>
-    <string name="pref_issuers_description">Enable this to show the issuer next to the profile name</string>
+    <string name="pref_night_mode_title">Night mode</string>
+    <string name="pref_night_mode_summary">Enable this to use darker colors</string>
+    <string name="pref_issuer_title">Show the issuer</string>
+    <string name="pref_issuer_summary">Enable this to show the issuer next to the profile name</string>
+    <string name="pref_timeout_title">Timeout</string>
+    <string name="pref_timeout_summary">Automatically lock the database after %1$s seconds of inactivity</string>
+    <string name="pref_slots_title">Key slots</string>
+    <string name="pref_slots_summary">Manage the list of keys that can decrypt the database</string>
+    <string name="pref_import_title">Import</string>
+    <string name="pref_import_summary">Import a database</string>
+    <string name="pref_export_title">Export</string>
+    <string name="pref_export_summary">Export the database</string>
 
     <string name="fingerprint_hint">Touch sensor</string>
     <string name="fingerprint_not_recognized">Fingerprint not recognized. Try again</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d4bf5d19..da5ebeab 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -7,34 +7,41 @@
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="pref_night_mode"
-            android:title="@string/pref_night_mode"
-            android:summary="@string/pref_night_mode_description"/>
+            android:title="@string/pref_night_mode_title"
+            android:summary="@string/pref_night_mode_summary"/>
 
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="pref_issuer"
-            android:title="@string/pref_issuers"
-            android:summary="@string/pref_issuers_description"/>
+            android:title="@string/pref_issuer_title"
+            android:summary="@string/pref_issuer_summary"/>
     </PreferenceCategory>
 
     <PreferenceCategory
         android:title="Security">
+        <EditTextPreference
+            android:key="pref_timeout"
+            android:title="@string/pref_timeout_title"
+            android:summary="@string/pref_timeout_summary"
+            android:inputType="number"
+            android:defaultValue="30"
+            android:dialogTitle="Set number of seconds of inactivity before Aegis locks the database"/>
         <Preference
             android:key="pref_slots"
-            android:title="Key slots"
-            android:summary="Manage the list of keys that can decrypt the database"/>
+            android:title="@string/pref_slots_title"
+            android:summary="@string/pref_slots_summary"/>
     </PreferenceCategory>
 
     <PreferenceCategory
         android:title="Tools">
         <Preference
             android:key="pref_import"
-            android:title="Import"
-            android:summary="Import a database"/>
+            android:title="@string/pref_import_title"
+            android:summary="@string/pref_import_summary"/>
         <Preference
             android:key="pref_export"
-            android:title="Export"
-            android:summary="Export the database"/>
+            android:title="@string/pref_export_title"
+            android:summary="@string/pref_export_summary"/>
     </PreferenceCategory>
 
 </PreferenceScreen>