diff --git a/packages/desktop-client/src/components/FixedSizeList.js b/packages/desktop-client/src/components/FixedSizeList.js
index fa4a47cce73eca2205c6cab398d066ed7a1071e6..62ad8b81e96242e699c3b6839c3225cc6c0a16b9 100644
--- a/packages/desktop-client/src/components/FixedSizeList.js
+++ b/packages/desktop-client/src/components/FixedSizeList.js
@@ -206,7 +206,7 @@ export default class FixedSizeList extends PureComponent {
             style={{
               height,
               width,
-              overflow: 'auto',
+              overflow: 'hidden auto',
               ...style,
             }}
           >
diff --git a/packages/desktop-client/src/style/styles.ts b/packages/desktop-client/src/style/styles.ts
index a902833396803c6b5395c48cb2334666e0ef163e..3355656908a443a2c42fb656f0f892a16fed93a0 100644
--- a/packages/desktop-client/src/style/styles.ts
+++ b/packages/desktop-client/src/style/styles.ts
@@ -31,7 +31,9 @@ export const styles = {
   },
   page: {
     flex: 1,
-    minHeight: 700, // ensure we can scroll on small screens
+    '@media (max-height: 550px)': {
+      minHeight: 700, // ensure we can scroll on small screens
+    },
     paddingTop: 8, // height of the titlebar
     [`@media (min-width: ${tokens.breakpoint_small})`]: {
       paddingTop: 36,
diff --git a/upcoming-release-notes/1385.md b/upcoming-release-notes/1385.md
new file mode 100644
index 0000000000000000000000000000000000000000..e1cd69909fa87dfb5212b5cf831a0a025ce5ab57
--- /dev/null
+++ b/upcoming-release-notes/1385.md
@@ -0,0 +1,5 @@
+---
+category: Bugfix
+authors: [aleetsaiya]
+---
+Remove double scrollbar while the viewport is big enough and remove the horizontal scrollbar under the transaction table.
\ No newline at end of file