diff --git a/lib/gui/app/styled-components.tsx b/lib/gui/app/styled-components.tsx
index 3bd78c1a..22dd02d2 100644
--- a/lib/gui/app/styled-components.tsx
+++ b/lib/gui/app/styled-components.tsx
@@ -142,7 +142,7 @@ export const Modal = styled(({ style, children, ...props }) => {
 			{...props}
 		>
 			<ScrollableFlex flexDirection="column" width="100%" height="90%">
-				{...children}
+				{children.length ? children.map((c: any) => <>{c}</>) : children}
 			</ScrollableFlex>
 		</ModalBase>
 	);
diff --git a/lib/gui/etcher.ts b/lib/gui/etcher.ts
index 38dab53b..51549645 100644
--- a/lib/gui/etcher.ts
+++ b/lib/gui/etcher.ts
@@ -29,7 +29,7 @@ import { delay, getConfig } from '../shared/utils';
 import * as settings from './app/models/settings';
 import { logException } from './app/modules/analytics';
 import { buildWindowMenu } from './menu';
-import i18n from 'i18next';
+import * as i18n from 'i18next';
 
 const customProtocol = 'etcher';
 const scheme = `${customProtocol}://`;