diff --git a/src/ui/pages/settings_page.cpp b/src/ui/pages/settings_page.cpp
index de6aa89..1a163f0 100644
--- a/src/ui/pages/settings_page.cpp
+++ b/src/ui/pages/settings_page.cpp
@@ -1556,10 +1556,15 @@ void RenderSettingsPage(App* app) {
                     for (int i = 0; i < 6; i++) {
                         if (timeoutValues[i] == timeout) { selTimeout = i; break; }
                     }
-                    if (includeRpcEncrypt)
+                    // In a narrow (two-column) card the encrypt controls + auto-lock + PIN don't fit on
+                    // one row, so wrap the auto-lock/PIN group onto its own row at the section's left edge.
+                    const bool secWrap = includeRpcEncrypt && secColW < 740.0f * Layout::dpiScale();
+                    if (includeRpcEncrypt && !secWrap) {
                         ImGui::SameLine(0, Layout::spacingLg());
-                    else
+                    } else {
+                        if (includeRpcEncrypt) ImGui::Dummy(ImVec2(0, Layout::spacingXs()));
                         ImGui::SetCursorScreenPos(ImVec2(secX, ImGui::GetCursorScreenPos().y));
+                    }
                     ImGui::AlignTextToFramePadding();
                     Type().textColored(TypeStyle::Caption, OnSurfaceMedium(), TR("settings_auto_lock"));
                     ImGui::SameLine(0, Layout::spacingXs());