--- libscidavis/src/ApplicationWindow.cpp.orig	2020-05-10 23:27:36 UTC
+++ libscidavis/src/ApplicationWindow.cpp
@@ -4253,7 +4253,7 @@ void ApplicationWindow::readSettings()
 	settings.endGroup(); // Colors
 
 	settings.beginGroup("/Paths");
-	workingDir = settings.value("/WorkingDir", qApp->applicationDirPath()).toString();
+	workingDir = settings.value("/WorkingDir", QDir::homePath()).toString();
     helpFilePath = settings.value("/HelpFile", "").toString();
 #ifdef PLUGIN_PATH
 	QString defaultFitPluginsPath = PLUGIN_PATH;
@@ -8211,6 +8211,10 @@ void ApplicationWindow::showWindowTitleBarMenu()
 void ApplicationWindow::chooseHelpFolder()
 {
 // TODO: move all paths & location handling to anothor class  
+#ifdef DOC_PATH
+	const QString locateDefaultHelp = DOC_PATH +
+	    QDir::toNativeSeparators("/manual/index.html");
+#else // defined DOC_PATH
 #if defined(Q_OS_WIN)
 	const QString locateDefaultHelp = qApp->applicationDirPath() +
         QDir::toNativeSeparators("/manual/index.html");
@@ -8218,6 +8222,8 @@ void ApplicationWindow::chooseHelpFolder()
     const QString locateDefaultHelp =
         QDir::toNativeSeparators("/usr/share/doc/scidavis/manual/index.html");
 #endif
+#endif // defined DOC_PATH
+
     if (QFile(locateDefaultHelp).exists())
     {
         helpFilePath = locateDefaultHelp;