diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index 27b9f40a..f0abef22 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -235,6 +235,11 @@ typedef NS_ENUM(NSUInteger, MPContentTab) {
   }
   self.didPushHistory = NO;
   
+  /* manually commit editing on any active editors */
+  [self commitEditing];
+  [self.entryViewController commitEditing];
+  [self.groupViewController commitEditing];
+  
   self.representedObject = node;
   self.entryViewController.representedObject = node.asEntry;
   self.groupViewController.representedObject = node.asGroup;