diff --git a/packages/web/src/appobj/connectionAppObject.js b/packages/web/src/appobj/connectionAppObject.js
index 3abb8d64..aadc94c2 100644
--- a/packages/web/src/appobj/connectionAppObject.js
+++ b/packages/web/src/appobj/connectionAppObject.js
@@ -76,7 +76,7 @@ const connectionAppObject = (flags) => (
   if (openedConnections.includes(_id)) {
     if (!status) statusIcon = 'icon loading';
     else if (status.name == 'pending') statusIcon = 'icon loading';
-    else if (status.name == 'ok') statusIcon = 'img green-ok';
+    else if (status.name == 'ok') statusIcon = 'img ok';
     else statusIcon = 'img error';
     if (status && status.name == 'error') {
       statusTitle = status.message;
diff --git a/packages/web/src/icons.js b/packages/web/src/icons.js
index 038e5ab3..e48cd087 100644
--- a/packages/web/src/icons.js
+++ b/packages/web/src/icons.js
@@ -44,7 +44,7 @@ const iconNames = {
   'icon chevron-down': 'mdi mdi-chevron-down',
   'icon plugin': 'mdi mdi-toy-brick',
 
-  'img green-ok': 'mdi mdi-check-circle color-green-8',
+  'img ok': 'mdi mdi-check-circle color-green-8',
   'img alert': 'mdi mdi-alert-circle color-blue-6',
   'img error': 'mdi mdi-close-circle color-red-7',
   // 'img statusbar-ok': 'mdi mdi-check-circle color-on-statusbar-green',
diff --git a/packages/web/src/modals/ConnectionModal.js b/packages/web/src/modals/ConnectionModal.js
index f965637d..5d7edb25 100644
--- a/packages/web/src/modals/ConnectionModal.js
+++ b/packages/web/src/modals/ConnectionModal.js
@@ -8,22 +8,34 @@ import ModalHeader from './ModalHeader';
 import ModalFooter from './ModalFooter';
 import ModalContent from './ModalContent';
 import useExtensions from '../utility/useExtensions';
+import LoadingInfo from '../widgets/LoadingInfo';
+import { FontIcon } from '../icons';
 // import FormikForm from '../utility/FormikForm';
 
 export default function ConnectionModal({ modalState, connection = undefined }) {
-  const [sqlConnectResult, setSqlConnectResult] = React.useState('Not connected');
+  const [sqlConnectResult, setSqlConnectResult] = React.useState(null);
   const extensions = useExtensions();
+  const [isTesting, setIsTesting] = React.useState(false);
+  const testIdRef = React.useRef(0);
 
   const handleTest = async (values) => {
+    setIsTesting(true);
+    testIdRef.current += 1;
+    const testid = testIdRef.current;
     const resp = await axios.post('connections/test', values);
-    const { error, version } = resp.data;
+    if (testIdRef.current != testid) return;
 
-    setSqlConnectResult(error || version);
+    setIsTesting(false);
+    setSqlConnectResult(resp.data);
+  };
+
+  const handleCancel = async () => {
+    testIdRef.current += 1; // invalidate current test
+    setIsTesting(false);
   };
 
   const handleSubmit = async (values) => {
-    const resp = await axios.post('connections/save', values);
-
+    axios.post('connections/save', values);
     modalState.close();
   };
   return (
@@ -46,13 +58,28 @@ export default function ConnectionModal({ modalState, connection = undefined })
             <FormTextField label="Server" name="server" />
             <FormTextField label="Port" name="port" />
             <FormTextField label="User" name="user" />
-            <FormTextField label="Password" name="password" />
+            <FormTextField label="Password" name="password" type="password" />
             <FormTextField label="Display name" name="displayName" />
-            <div>Connect result: {sqlConnectResult}</div>
+            {!isTesting && sqlConnectResult && sqlConnectResult.msgtype == 'connected' && (
+              <div>
+                Connected: <FontIcon icon="img ok" /> {sqlConnectResult.version}
+              </div>
+            )}
+            {!isTesting && sqlConnectResult && sqlConnectResult.msgtype == 'error' && (
+              <div>
+                Connect failed: <FontIcon icon="img error" /> {sqlConnectResult.error}
+              </div>
+            )}
+            {isTesting && <LoadingInfo message="Testing connection" />}
           </ModalContent>
 
           <ModalFooter>
-            <FormButton text="Test" onClick={handleTest} />
+            {isTesting ? (
+              <FormButton text="Cancel" onClick={handleCancel} />
+            ) : (
+              <FormButton text="Test" onClick={handleTest} />
+            )}
+
             <FormSubmit text="Save" />
           </ModalFooter>
         </Form>