diff --git a/client/src/components/ConfigItem.js b/client/src/components/ConfigItem.js
index 757a99b..7758c44 100644
--- a/client/src/components/ConfigItem.js
+++ b/client/src/components/ConfigItem.js
@@ -47,6 +47,8 @@ class ConfigItem extends React.Component {
         <Modal
           isOpen={this.state.detailsOpen}
           onRequestClose={() => this.setState({ detailsOpen: false })}
+          ariaHideApp={false}
+          shouldReturnFocusAfterClose={false}
         >
           <h3>Config Details</h3>
 
diff --git a/client/src/components/ServerItem.js b/client/src/components/ServerItem.js
index 82205e5..a20388f 100644
--- a/client/src/components/ServerItem.js
+++ b/client/src/components/ServerItem.js
@@ -28,6 +28,8 @@ class ServerItem extends Component {
       <Modal
         isOpen={this.state.tmpConfigModalOpen}
         onRequestClose={() => this.setState({ tmpConfigModalOpen: false })}
+        ariaHideApp={false}
+        shouldReturnFocusAfterClose={false}
       >
         <h3>Server Details</h3>