diff --git a/apps/client/src/widgets/type_widgets/options/components/TimeSelector.tsx b/apps/client/src/widgets/type_widgets/options/components/TimeSelector.tsx
index 3704db064..b1435fea6 100644
--- a/apps/client/src/widgets/type_widgets/options/components/TimeSelector.tsx
+++ b/apps/client/src/widgets/type_widgets/options/components/TimeSelector.tsx
@@ -61,13 +61,13 @@ export default function TimeSelector({ name, label, includedTimeScales, optionVa
 
                         let time = parseInt(value, 10);
                         const minimumSecondsOrDefault = (minimumSeconds ?? 0);
+                        const newTime = convertTime(time, scale).toOption();
 
-                        if (Number.isNaN(time) || time < (minimumSecondsOrDefault)) {
+                        if (Number.isNaN(time) || newTime < (minimumSecondsOrDefault)) {
                             toast.showError(t("time_selector.minimum_input", { minimumSeconds: minimumSecondsOrDefault }));
                             time = minimumSecondsOrDefault;
                         }
 
-                        const newTime = convertTime(time, scale).toOption();
                         setValue(newTime);
                     }}
                 />
diff --git a/apps/client/src/widgets/type_widgets/options/password.tsx b/apps/client/src/widgets/type_widgets/options/password.tsx
index ecd14c9b8..1a1ad3961 100644
--- a/apps/client/src/widgets/type_widgets/options/password.tsx
+++ b/apps/client/src/widgets/type_widgets/options/password.tsx
@@ -11,6 +11,8 @@ import OptionsSection from "./components/OptionsSection"
 import protected_session_holder from "../../../services/protected_session_holder"
 import { ChangePasswordResponse } from "@triliumnext/commons"
 import dialog from "../../../services/dialog"
+import TimeSelector from "./components/TimeSelector"
+import FormText from "../../react/FormText"
 
 export default function PasswordSettings() {
     return (
@@ -106,9 +108,18 @@ function ChangePassword() {
 function ProtectedSessionTimeout() {
     return (
         <OptionsSection title={t("password.protected_session_timeout")}>
-            {t("password.protected_session_timeout_description")}
-            &nbsp;
-            <a class="tn-link" href="https://triliumnext.github.io/Docs/Wiki/protected-notes.html" className="external">{t("password.wiki")}</a> {t("password.for_more_info")}
+            <FormText>
+                {t("password.protected_session_timeout_description")}
+                &nbsp;
+                <a class="tn-link" href="https://triliumnext.github.io/Docs/Wiki/protected-notes.html" className="external">{t("password.wiki")}</a> {t("password.for_more_info")}
+            </FormText>
+            
+            <TimeSelector
+                name="protected-session-timeout"
+                label={t("password.protected_session_timeout_label")}
+                optionValueId="protectedSessionTimeout" optionTimeScaleId="protectedSessionTimeoutTimeScale"
+                minimumSeconds={60}
+            />
         </OptionsSection>
     )
 }
\ No newline at end of file
diff --git a/apps/client/src/widgets/type_widgets/options/password/protected_session_timeout.ts b/apps/client/src/widgets/type_widgets/options/password/protected_session_timeout.ts
deleted file mode 100644
index f1c044c42..000000000
--- a/apps/client/src/widgets/type_widgets/options/password/protected_session_timeout.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import TimeSelector from "../time_selector.js";
-
-const TPL = /*html*/`
-<div class="options-section">
-    <p class="form-text">
-
-    </p>
-    <div id="time-selector-placeholder"></div>
-</div>`;
-
-export default class ProtectedSessionTimeoutOptions extends TimeSelector {
-    constructor() {
-        super({
-            widgetId: "protected-session-timeout",
-            widgetLabelId: "password.protected_session_timeout_label",
-            optionValueId: "protectedSessionTimeout",
-            optionTimeScaleId: "protectedSessionTimeoutTimeScale",
-            minimumSeconds: 60
-        });
-        super.doRender();
-    }
-
-    doRender() {
-        const $timeSelector = this.$widget;
-        // inject TimeSelector widget template
-        this.$widget = $(TPL);
-        this.$widget.find("#time-selector-placeholder").replaceWith($timeSelector);
-    }
-}