diff --git a/packages/desktop-client/src/browser-preload.browser.js b/packages/desktop-client/src/browser-preload.browser.js
index b8b26bee6f4d0a3c1eefccefea2eeb6c8fbc83c5..3f183e4ee718f0e9218c8167b3d0fb5cfe2befa2 100644
--- a/packages/desktop-client/src/browser-preload.browser.js
+++ b/packages/desktop-client/src/browser-preload.browser.js
@@ -168,6 +168,14 @@ document.addEventListener('keydown', e => {
     }
     // Cmd/Ctrl+z
     else if (e.keyCode === 90) {
+      if (
+        e.target.tagName === 'INPUT' ||
+        e.target.tagName === 'TEXTAREA' ||
+        e.target.isContentEditable
+      ) {
+        return;
+      }
+      e.preventDefault();
       if (e.shiftKey) {
         // Redo
         window.__actionsForMenu.redo();
diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.js
index 0d5a3d50d514e9e827014a448ef581725e6f7ffc..54d15ac2c71d59e760a2d272c2532e7caca0df4c 100644
--- a/packages/desktop-client/src/components/accounts/TransactionsTable.js
+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js
@@ -557,6 +557,11 @@ export const Transaction = React.memo(function Transaction(props) {
     if (transaction[name] !== value) {
       let newTransaction = { ...transaction, [name]: value };
 
+      // Don't change the note to an empty string if it's null (since they are both rendered the same)
+      if (name === 'note' && value === '' && transaction.note == null) {
+        return;
+      }
+
       if (
         name === 'account' &&
         value &&