diff --git a/Gruntfile.js b/Gruntfile.js
index 9a605130..613b6f0f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -97,6 +97,11 @@ module.exports = function(grunt) {
                 expand: true,
                 nonull: true
             },
+            'desktop_windows_helper': {
+                src: 'helper/win32/KeeWebHelper.exe',
+                dest: 'tmp/desktop/app/',
+                nonull: true
+            },
             'desktop_osx': {
                 src: 'tmp/desktop/mac/KeeWeb-' + pkg.version + '.dmg',
                 dest: 'dist/desktop/KeeWeb.mac.dmg',
@@ -467,6 +472,7 @@ module.exports = function(grunt) {
         'validate-desktop-update',
         'electron',
         'electron-builder:osx',
+        'copy:desktop_windows_helper',
         'electron-builder:win',
         'compress:linux64',
         'compress:linux32',
diff --git a/app/scripts/auto-type/helper/auto-type-helper-win32.js b/app/scripts/auto-type/helper/auto-type-helper-win32.js
index 506f4f20..ce03a7b3 100644
--- a/app/scripts/auto-type/helper/auto-type-helper-win32.js
+++ b/app/scripts/auto-type/helper/auto-type-helper-win32.js
@@ -19,7 +19,7 @@ AutoTypeHelper.prototype.getActiveWindowTitle = function(callback) {
 };
 
 AutoTypeHelper.getHelperPath = function() {
-    return Launcher.getAppPath('KeeWebHelper.exe');
+    return Launcher.getAppPath('helper/win32/KeeWebHelper.exe');
 };
 
 module.exports = AutoTypeHelper;
diff --git a/electron/squirrel-handler.js b/electron/squirrel-handler.js
index d67e1a7e..a56caa4c 100644
--- a/electron/squirrel-handler.js
+++ b/electron/squirrel-handler.js
@@ -6,7 +6,8 @@
 /* jshint node:true */
 /* jshint browser:false */
 
-var app = require('app'),
+var electron = require('electron'),
+    app = electron.app,
     fs = require('fs'),
     path = require('path'),
     spawn = require('child_process').spawn;
diff --git a/helper/win32/KeeWebHelper.exe b/helper/win32/KeeWebHelper.exe
new file mode 100755
index 00000000..4a3380d3
Binary files /dev/null and b/helper/win32/KeeWebHelper.exe differ