diff --git a/packages/desktop-client/src/components/select/DateSelect.js b/packages/desktop-client/src/components/select/DateSelect.js
index e60af0a7a746e5d7aad7a18a5975cb0dbe32928c..2cd6ef0d6adc4876d2390af2f8cc69f61817784c 100644
--- a/packages/desktop-client/src/components/select/DateSelect.js
+++ b/packages/desktop-client/src/components/select/DateSelect.js
@@ -263,12 +263,10 @@ export default function DateSelect({
       let date = d.parse(selectedValue, dateFormat, new Date());
       onSelect(d.format(date, 'yyyy-MM-dd'));
 
-      if (open) {
-        if (userSelectedValue.current !== selectedValue) {
-          // This stops the event from propagating up
-          e.stopPropagation();
-          e.preventDefault();
-        }
+      if (open && e.key === 'Enter') {
+        // This stops the event from propagating up
+        e.stopPropagation();
+        e.preventDefault();
       }
 
       let { onKeyDown } = inputProps || {};
diff --git a/upcoming-release-notes/1316.md b/upcoming-release-notes/1316.md
new file mode 100644
index 0000000000000000000000000000000000000000..bf343316524aeb9c908666e28868cc864239f9a7
--- /dev/null
+++ b/upcoming-release-notes/1316.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [aleetsaiya]
+---
+
+Fix clicking enter will create empty transaction issue.