diff --git a/Products/zms/zpt/ZMS/manage_customizelanguagesform.zpt b/Products/zms/zpt/ZMS/manage_customizelanguagesform.zpt
index d2a57f47f..46dc840cc 100644
--- a/Products/zms/zpt/ZMS/manage_customizelanguagesform.zpt
+++ b/Products/zms/zpt/ZMS/manage_customizelanguagesform.zpt
@@ -167,8 +167,21 @@
 	</tbody>
 	</table>
 	<div class="controls save">
-		<button title="Save Dictionary"  name="btn" type="submit" class="btn btn-secondary" value="BTN_SAVE" tal:content="python:here.getZMILangStr('BTN_SAVE')">Save</button>
-		<button title="Delete Selected Dictionary Terms" name="btn" type="submit" class="btn btn-secondary" value="BTN_DELETE" tal:content="python:here.getZMILangStr('BTN_DELETE')">Delete</button>
+		<button title="Save Dictionary"  name="btn" type="submit" class="btn btn-secondary" 
+			hx-trigger="click"
+			hx-post="manage_changeLangDictProperties" 
+			hx-target="body" 
+			hx-swap="outerHTML show:top"
+			hx-on:click="$ZMI.show_spinner(this)"
+			hx-on:htmx:after-request="$ZMI.reset_spinner(this)"
+			value="BTN_SAVE" 
+			tal:content="python:here.getZMILangStr('BTN_SAVE')">
+			Save
+		</button>
+		<button title="Delete Selected Dictionary Terms" name="btn" type="submit" class="btn btn-secondary" 
+			value="BTN_DELETE" tal:content="python:here.getZMILangStr('BTN_DELETE')">
+			Delete
+		</button>
 	</div>
 </form>
 
diff --git a/Products/zms/zpt/ZMSMetamodelProvider/manage_metas.zpt b/Products/zms/zpt/ZMSMetamodelProvider/manage_metas.zpt
index bafe9cbf6..5705ff5e7 100644
--- a/Products/zms/zpt/ZMSMetamodelProvider/manage_metas.zpt
+++ b/Products/zms/zpt/ZMSMetamodelProvider/manage_metas.zpt
@@ -182,7 +182,7 @@
 	</tbody>
 	</table>
 	<div class="controls save">
-		<button name="btn" type="button" class="btn btn-secondary" 
+		<button name="btn" type="submit" class="btn btn-secondary" 
 			hx-trigger="click"
 			hx-post="manage_changeMetaProperties" 
 			hx-target="#zmi_manage_tabs_message"