diff --git a/.gitignore b/.gitignore
index 831e25725..d84c44bf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ cert.key
 cert.crt
 server-package.json
 .idea/httpRequests/
+data/
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bc4ec316b..1062d3362 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -6,4 +6,9 @@
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
+  <component name="SwUserDefinedSpecifications">
+    <option name="specTypeByUrl">
+      <map />
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/package.json b/package.json
index ea9734054..d37418087 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
     "url": "https://github.com/zadam/trilium.git"
   },
   "scripts": {
-    "start-server": "cross-env TRILIUM_ENV=dev node ./src/www",
-    "start-electron": "cross-env TRILIUM_ENV=dev electron --inspect=5858 .",
+    "start-server": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev node ./src/www",
+    "start-electron": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev electron --inspect=5858 .",
     "build-backend-docs": "rm -r ./docs/backend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/backend_api src/becca/entities/*.js src/services/backend_script_api.js src/services/sql.js",
     "build-frontend-docs": "rm -r ./docs/frontend_api && ./node_modules/.bin/jsdoc -c jsdoc-conf.json -d ./docs/frontend_api src/public/app/entities/*.js src/public/app/services/frontend_script_api.js src/public/app/widgets/collapsible_widget.js",
     "build-docs": "npm run build-backend-docs && npm run build-frontend-docs",