diff --git a/app/renderer/components/common/commonForm.js b/app/renderer/components/common/commonForm.js
index 800394b55a4..9ca3b49e217 100644
--- a/app/renderer/components/common/commonForm.js
+++ b/app/renderer/components/common/commonForm.js
@@ -137,6 +137,9 @@ const styles = StyleSheet.create({
     cursor: 'default',
     width: '100%',
     maxWidth: globalStyles.spacing.dialogWidth,
+    minWidth: '310px',
+    height: 'auto',
+    maxHeight: '100vh', // #8634: commonStyles.flyoutDialog,
     userSelect: 'none'
 
     // Need a general solution
@@ -159,6 +162,7 @@ const styles = StyleSheet.create({
 
   commonFormBookmarkHanger: {
     maxWidth: globalStyles.spacing.bookmarkHangerMaxWidth,
+    height: 'initial', // #8634
 
     // Cancel the inherited value from .navbarMenubarFlexContainer, which is 'nowrap'.
     whiteSpace: 'normal'