diff --git a/renderer/containers/Home.js b/renderer/containers/Home/Home.js
similarity index 82%
rename from renderer/containers/Home.js
rename to renderer/containers/Home/Home.js
index 426bb4f827f..8b29e0b5b25 100644
--- a/renderer/containers/Home.js
+++ b/renderer/containers/Home/Home.js
@@ -18,7 +18,8 @@ import {
 } from 'reducers/lnd'
 import { showError, showNotification } from 'reducers/notification'
 import Home from 'components/Home'
-import DeleteWalletDialog from './Home/DeleteWalletDialog'
+import DeleteWalletDialog from './DeleteWalletDialog'
+import AppErrorBoundary from 'components/ErrorBoundary/AppErrorBoundary'
 
 const HomeWrapper = props => (
   <>
@@ -56,7 +57,15 @@ const mapDispatchToProps = {
   generateLndConfigFromWallet,
 }
 
-export default connect(
+const ConnectedHome = connect(
   mapStateToProps,
   mapDispatchToProps
 )(HomeWrapper)
+
+const HomeWithErrorBoundaries = props => (
+  <AppErrorBoundary>
+    <ConnectedHome {...props} />
+  </AppErrorBoundary>
+)
+
+export default HomeWithErrorBoundaries
diff --git a/renderer/containers/Home/index.js b/renderer/containers/Home/index.js
new file mode 100644
index 00000000000..cfd2e828d09
--- /dev/null
+++ b/renderer/containers/Home/index.js
@@ -0,0 +1,3 @@
+import Home from './Home'
+
+export default Home