diff --git a/client/actions.js b/client/actions.js
index 9e8f92b8..467a896d 100644
--- a/client/actions.js
+++ b/client/actions.js
@@ -57,6 +57,10 @@ const actions = {
 
       function handleRedis(config, override) {
         dispatch({ type: 'updateConnectStatus', data: 'Redis connecting...' });
+        if (config.ssl) {
+          config.tls = {
+          }
+        }
         const redis = new Redis(_.assign({}, config, override, {
           showFriendlyErrorStack: true,
           retryStrategy() {
diff --git a/client/components/main/Main/ConnectionSelector/Config.jsx b/client/components/main/Main/ConnectionSelector/Config.jsx
index d35b50d6..9839e421 100644
--- a/client/components/main/Main/ConnectionSelector/Config.jsx
+++ b/client/components/main/Main/ConnectionSelector/Config.jsx
@@ -49,7 +49,7 @@ class Config extends React.Component {
 
   handleChange(property, e) {
     let value = e.target.value;
-    if (property === 'ssh') {
+    if (property === 'ssh' || property === 'ssl') {
       value = e.target.checked;
     }
     this.setProp(property, value);
@@ -81,6 +81,10 @@ class Config extends React.Component {
           <label htmlFor="password">Password:</label>
           <input type="password" id="password" onChange={this.handleChange.bind(this, 'password')} value={this.getProp('password')} />
         </div>
+        <div className="nt-form-row">
+          <label htmlFor="ssh">SSL:</label>
+          <input type="checkbox" id="ssl" onChange={this.handleChange.bind(this, 'ssl')} checked={this.getProp('ssl')} />
+        </div>
         <div className="nt-form-row">
           <label htmlFor="ssh">SSH Tunnel:</label>
           <input type="checkbox" id="ssh" onChange={this.handleChange.bind(this, 'ssh')} checked={this.getProp('ssh')} />
diff --git a/client/components/main/Main/ConnectionSelector/Config.scss b/client/components/main/Main/ConnectionSelector/Config.scss
index 9fdeb8a3..206a8dce 100644
--- a/client/components/main/Main/ConnectionSelector/Config.scss
+++ b/client/components/main/Main/ConnectionSelector/Config.scss
@@ -3,13 +3,13 @@
 }
 
 .ssh-key {
-  height: 20px;
+  height: 19px;
   line-height: 20px;
   padding: 0;
   text-align: center;
   width: 30px;
   position: relative;
-  top: -1px;
+  top: 0;
   left: -30px;
   border-top: 0;
   border-bottom: 0;
diff --git a/client/components/main/Main/Database/KeyBrowser/Footer.jsx b/client/components/main/Main/Database/KeyBrowser/Footer.jsx
index 4ebb47c2..60f9c929 100644
--- a/client/components/main/Main/Database/KeyBrowser/Footer.jsx
+++ b/client/components/main/Main/Database/KeyBrowser/Footer.jsx
@@ -10,6 +10,7 @@ class Footer extends React.Component {
 
   componentDidMount() {
     this.updateInfo();
+    this.updateDBCount();
     this.interval = setInterval(this.updateInfo.bind(this), 10000);
   }
 
@@ -19,6 +20,25 @@ class Footer extends React.Component {
     }
   }
 
+  updateDBCount() {
+    this.props.redis.config('get', 'databases', (err, res) => {
+      if (!err) {
+        if (res[1]) {
+          this.setState({ databases: Number(res[1]) });
+        } else {
+          const redis = this.props.redis.duplicate();
+          const select = redis.select.bind(redis);
+          this.guessDatabaseNumber(select, 15).then((count) => {
+            console.log('===', count)
+            return typeof count === 'number' ? count : this.guessDatabaseNumber(select, 1, 0);
+          }).then((count) => {
+            this.setState({ databases: count + 1 });
+          });
+        }
+      }
+    });
+  }
+
   updateInfo() {
     this.props.redis.info((err, res) => {
       if (err) {
@@ -36,12 +56,21 @@ class Footer extends React.Component {
 
       this.setState(info);
     });
+  }
 
-    this.props.redis.config('get', 'databases', (err, res) => {
-      if (res && res[1]) {
-        this.setState({ databases: Number(res[1]) });
+  guessDatabaseNumber(select, startIndex, lastSuccessIndex) {
+    if (startIndex > 30) {
+      return Promise.resolve(30);
+    }
+    return select(startIndex)
+    .then(() => {
+      return this.guessDatabaseNumber(select, startIndex + 1, startIndex);
+    }).catch((err) => {
+      if (typeof lastSuccessIndex === 'number') {
+        return lastSuccessIndex;
       }
-    });
+      return null;
+    })
   }
 
   componentWillUnmount() {
@@ -87,7 +116,7 @@ class Footer extends React.Component {
               >{i}</option>);
             }
             return items;
-          })(this.state.databases)
+          })(this.state.databases || 1)
         }
       </select>
     </div>
diff --git a/client/components/main/Main/Database/KeyBrowser/KeyList.jsx b/client/components/main/Main/Database/KeyBrowser/KeyList.jsx
index 6e386c9c..403e01d6 100644
--- a/client/components/main/Main/Database/KeyBrowser/KeyList.jsx
+++ b/client/components/main/Main/Database/KeyBrowser/KeyList.jsx
@@ -449,7 +449,7 @@ class KeyList extends React.Component {
               if (this.state.scanning) {
                 return <span style={ { color: '#ccc' }}>Scanning...(cursor {this.state.cursor})</span>;
               }
-              return <a href="#" onClick={(evt) => {
+              return <a href="#" style={ { color: '#666' } } onClick={(evt) => {
                 evt.preventDefault();
                 this.scan();
               }}>Scan more</a>;
diff --git a/server/main.js b/server/main.js
index cec472b4..b0adfc27 100644
--- a/server/main.js
+++ b/server/main.js
@@ -21,6 +21,12 @@ app.on('window-all-closed', function () {
   }
 });
 
+app.on('activate', function (e, hasVisibleWindows) {
+  if (!hasVisibleWindows) {
+    windowManager.create();
+  }
+});
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 app.on('ready', function () {