Merge branch 'develop'v5.0.0-beta.21

1 files changed, 14 insertions, 9 deletions

diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index 3cb08feb1..72ba7b2e3 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 
+import ErrorBoundary from '../util/ErrorBoundary';
 import { oneOrManyChildElements } from '../../prop-types';
 import Appear from '../ui/effects/Appear';
 
@@ -36,18 +37,22 @@ export default @observer class SettingsLayout extends Component {
     return (
       <Appear transitionName="fadeIn-fast">
         <div className="settings-wrapper">
-          <button
-            className="settings-wrapper__action"
-            onClick={closeSettings}
-          />
-          <div className="settings franz-form">
-            {navigation}
-            {children}
+          <ErrorBoundary>
             <button
-              className="settings__close mdi mdi-close"
+              type="button"
+              className="settings-wrapper__action"
               onClick={closeSettings}
             />
-          </div>
+            <div className="settings franz-form">
+              {navigation}
+              {children}
+              <button
+                type="button"
+                className="settings__close mdi mdi-close"
+                onClick={closeSettings}
+              />
+            </div>
+          </ErrorBoundary>
         </div>
       </Appear>
     );