diff --git a/app/index.js b/app/index.js
index 80107cda..424379ec 100644
--- a/app/index.js
+++ b/app/index.js
@@ -9,6 +9,7 @@ const isDev = require('electron-is-dev');
 const AutoUpdater = require('./auto-updater');
 const toElectronBackgroundColor = require('./utils/to-electron-background-color');
 const notify = require('./notify');
+const { gitDescribe } = require('git-describe');
 
 app.commandLine.appendSwitch('js-flags', '--harmony');
 
@@ -36,6 +37,11 @@ app.getLastFocusedWindow = () => {
 
 if (isDev) {
   console.log('running in dev mode');
+
+  // Overide default appVersion which is set from package.json
+  gitDescribe({customArguments: ['--tags']}, (error, gitInfo) => {
+    if (!error) app.setVersion(gitInfo.raw);
+  });
 } else {
   console.log('running in prod mode');
 }
diff --git a/app/package.json b/app/package.json
index d1d11a6e..dfd75037 100644
--- a/app/package.json
+++ b/app/package.json
@@ -18,6 +18,7 @@
     "electron-is-dev": "0.1.1",
     "file-uri-to-path": "0.0.2",
     "gaze": "1.1.0",
+    "git-describe": "3.0.2",
     "mkdirp": "0.5.1",
     "ms": "0.7.1",
     "shell-env": "0.2.0",