diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
index 13af6a919..4c7e43a94 100644
--- a/contrib/build-wine/deterministic.spec
+++ b/contrib/build-wine/deterministic.spec
@@ -43,14 +43,15 @@ a.datas += extra_datas('plugins')
 pyz = PYZ(a.pure)
 exe = EXE(pyz,
           a.scripts,
-          exclude_binaries=1,
+          a.binaries,
+          a.datas,
           name=os.path.join('build\\pyi.win32\\electrum', 'electrum.exe'),
           debug=False,
           strip=None,
           upx=False,
           icon='icons/electrum.ico',
-          console=True)
-          # The console True makes an annoying black box pop up, but it does make Electrum accept command line options.
+          console=False)
+          # The console True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used
 
 coll = COLLECT(exe,
                a.binaries,
@@ -60,5 +61,5 @@ coll = COLLECT(exe,
                upx=True,
                debug=False,
                icon='icons/electrum.ico',
-               console=True,
+               console=False,
                name=os.path.join('dist', 'electrum'))
diff --git a/electrum b/electrum
index b96125552..d543116d8 100755
--- a/electrum
+++ b/electrum
@@ -88,6 +88,8 @@ if __name__ == '__main__':
 
     parser = arg_parser()
     options, args = parser.parse_args()
+    if options.portable and options.wallet_path is None:
+        options.wallet_path = os.path.dirname(os.path.realpath(__file__)) + '/electrum.dat'
     set_verbosity(options.verbose)
 
     # config is an object passed to the various constructors (wallet, interface, gui)