diff --git a/package.json b/package.json
index 8b6f9b5..0f030ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "donut",
-  "version": "2.2.1-alpha.1",
+  "version": "2.2.1",
   "description": "Cross platform cryptocurrency tracker",
   "main": "main.js",
   "scripts": {
diff --git a/src/app/components/Footer.jsx b/src/app/components/Footer.jsx
index 72ffb27..57d5ea6 100644
--- a/src/app/components/Footer.jsx
+++ b/src/app/components/Footer.jsx
@@ -107,8 +107,7 @@ export default class Footer extends React.Component {
 
     const { currencies, isUpdateAvailable, online, version, selectedCurrency } = this.state
 
-    const currencyKeys = Object.keys(currencies)
-    const currencyList = currencyKeys.map((currency) => {
+    const currencyList = currencies.map((currency) => {
       return <option key={currency} value={currency}>{currency}</option>
     })
 
@@ -141,9 +140,9 @@ export default class Footer extends React.Component {
               <span className='icon icon-cancel' />
             </button> : ''}
           </div>
-          <select className='form-control currency-list pull-right' value={selectedCurrency} onChange={this.handleCurrencyChange}>
+          {currencyList.length > 0 ? <select className='form-control currency-list pull-right' value={selectedCurrency} onChange={this.handleCurrencyChange}>
             {currencyList}
-          </select>
+          </select> : ''}
         </div>
       </footer>
     )
diff --git a/src/app/stores/CurrencyStore.js b/src/app/stores/CurrencyStore.js
index 2e476bb..ef2a0d7 100644
--- a/src/app/stores/CurrencyStore.js
+++ b/src/app/stores/CurrencyStore.js
@@ -10,7 +10,7 @@ class CurrencyStoreClass extends BaseStore {
   }
 
   getCurrencies () {
-    return this.currencyMap
+    return Object.keys(this.currencyMap)
   }
 
   syncCurrencies (currencies) {
diff --git a/src/package.json b/src/package.json
index c14ef79..411e28b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -4,7 +4,7 @@
   "description": "Cross platform cryptocurrency tracker",
   "homepage": "https://harshjv.github.io/donut/",
   "license": "MIT",
-  "version": "2.2.1-alpha.1",
+  "version": "2.2.1",
   "main": "main.js",
   "repository": "https://github.com/harshjv/donut",
   "keywords": [
diff --git a/src/sass/_photon.scss b/src/sass/_photon.scss
index 78ecd50..5898470 100644
--- a/src/sass/_photon.scss
+++ b/src/sass/_photon.scss
@@ -16,6 +16,6 @@
   border-left-color: #c2c0c2;
 }
 
-.toolbar-footer {
-  -webkit-app-region: no-drag!important;
+.toolbar-footer, .toolbar-actions {
+  -webkit-app-region: no-drag;
 }