diff --git a/solstone/apps/settings/tests/test_workspace_html.py b/solstone/apps/settings/tests/test_workspace_html.py
index 9b0ca5c4a..2789cb7f8 100644
--- a/solstone/apps/settings/tests/test_workspace_html.py
+++ b/solstone/apps/settings/tests/test_workspace_html.py
@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import re
+from html.parser import HTMLParser
 from pathlib import Path
 
 WORKSPACE = Path(__file__).resolve().parents[1] / "workspace.html"
@@ -24,6 +25,38 @@ def _section_block(text: str, section_id: str) -> str:
     return match.group(0)
 
 
+class _SettingsFormButtonParser(HTMLParser):
+    def __init__(self) -> None:
+        super().__init__(convert_charrefs=True)
+        self._settings_form_depth = 0
+        self.non_button_buttons: list[str] = []
+
+    def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None:
+        attr_map = dict(attrs)
+        classes = set((attr_map.get("class") or "").split())
+        starts_settings_form = tag == "form" and "settings-form" in classes
+        in_settings_form = self._settings_form_depth > 0 or starts_settings_form
+
+        if starts_settings_form:
+            self._settings_form_depth += 1
+
+        if tag == "button" and in_settings_form and attr_map.get("type") != "button":
+            self.non_button_buttons.append(
+                attr_map.get("id")
+                or attr_map.get("class")
+                or self.get_starttag_text()
+                or "<button>"
+            )
+
+    def handle_startendtag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None:
+        self.handle_starttag(tag, attrs)
+        self.handle_endtag(tag)
+
+    def handle_endtag(self, tag: str) -> None:
+        if tag == "form" and self._settings_form_depth > 0:
+            self._settings_form_depth -= 1
+
+
 def test_apikeys_inputs_are_masked_by_default():
     text = _workspace_text()
     keys = (
@@ -58,6 +91,44 @@ def test_password_toggle_does_not_steal_focus():
     assert "preventDefault()" in block
 
 
+def test_settings_form_buttons_are_non_submit_buttons():
+    text = _workspace_text()
+    parser = _SettingsFormButtonParser()
+    parser.feed(text)
+
+    assert parser.non_button_buttons == []
+
+
+def test_redact_add_enter_handler_is_explicit():
+    text = _workspace_text()
+
+    button = re.search(r'<button[^>]*\bid="redactAddBtn"[^>]*>', text)
+    assert button, "redact add button not found"
+    assert 'type="button"' in button.group(0)
+
+    listener_idx = text.index("document.getElementById('redactAddInput')")
+    block = text[listener_idx : listener_idx + 260]
+    assert "keydown" in block
+    assert "e.key === 'Enter'" in block
+    assert "e.preventDefault()" in block
+    assert "addRedactRule()" in block
+
+
+def test_agent_name_enter_handler_blurs_instead_of_submitting():
+    text = _workspace_text()
+
+    button = re.search(r'<button[^>]*\bid="resetAgentName"[^>]*>', text)
+    assert button, "agent name reset button not found"
+    assert 'type="button"' in button.group(0)
+
+    listener_idx = text.index("const agentNameInput = document.getElementById")
+    block = text[listener_idx : listener_idx + 360]
+    assert "keydown" in block
+    assert "e.key === 'Enter'" in block
+    assert "e.preventDefault()" in block
+    assert "agentNameInput.blur()" in block
+
+
 def test_workspace_has_diagnostic_reports_toggle():
     text = _workspace_text()
 
diff --git a/solstone/apps/settings/workspace.html b/solstone/apps/settings/workspace.html
index f7658b2fe..7f967af16 100644
--- a/solstone/apps/settings/workspace.html
+++ b/solstone/apps/settings/workspace.html
@@ -2187,7 +2187,7 @@ button:focus:not(:focus-visible) {
       <div class="setup-section" id="setupSection" style="display:none">
         <h3>welcome to solstone</h3>
         <p>create your first facet to start organizing your journal.</p>
-        <button class="setup-btn" id="createPersonalBtn">create personal facet</button>
+        <button type="button" class="setup-btn" id="createPersonalBtn">create personal facet</button>
       </div>
 
       <div class="settings-field">
@@ -2518,7 +2518,7 @@ button:focus:not(:focus-visible) {
           <div class="redact-list" id="redactRulesList"></div>
           <div class="redact-add-row">
             <input type="text" class="redact-add-input" id="redactAddInput" placeholder="add a redaction rule..." maxlength="200">
-            <button class="redact-add-btn" id="redactAddBtn">+ add</button>
+            <button type="button" class="redact-add-btn" id="redactAddBtn">+ add</button>
           </div>
           <div class="redact-validation" id="redactValidation" style="display:none"></div>
         </div>
@@ -2877,7 +2877,7 @@ button:focus:not(:focus-visible) {
       </div>
 
       <div class="settings-field">
-        <button class="setup-btn" id="resetAgentName" style="background: #6c757d; font-size: 0.85em; padding: 0.4em 1em;">reset to default</button>
+        <button type="button" class="setup-btn" id="resetAgentName" style="background: #6c757d; font-size: 0.85em; padding: 0.4em 1em;">reset to default</button>
         <small>reset the name back to "sol"</small>
       </div>
       </form>
@@ -5805,6 +5805,13 @@ document.getElementById('saveCustomActivityBtn').addEventListener('click', async
 // Agent name reset
 const agentNameInput = document.getElementById('field-agent-name');
 if (agentNameInput) {
+  agentNameInput.addEventListener('keydown', (e) => {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+      agentNameInput.blur();
+    }
+  });
+
   agentNameInput.addEventListener('change', async (e) => {
     const newName = e.target.value.trim() || 'sol';
     const today = new Date().toISOString().slice(0, 10);