diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8e925a94..50f80477 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2138,6 +2138,7 @@ Marko M
  for pointing out that "Menu button closes" should actually be "Menu key closes"
  for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel
  for reporting some uninitialized item area coordinates in cSkinLCARSDisplayMenu
+ for reporting a problem with the video directory not being set correctly with --edit
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week
diff --git a/HISTORY b/HISTORY
index ad37d6ca..a43afa3b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7866,3 +7866,6 @@ Video Disk Recorder Revision History
   Recordings menu is open (reported by Lars Hanisch).
 - Added a missing closing ')' in the help and man page entry of the --vfat option
   (reported by Lars Hanisch).
+- Fixed setting the name of the video directory to avoid a crash when using --genindex,
+  and also to use the correct directory with --edit (the latter reported by Marko
+  Mäkelä).
diff --git a/vdr.c b/vdr.c
index 00c517e3..e1857ead 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 2.57.1.3 2013/12/25 11:05:21 kls Exp $
+ * $Id: vdr.c 2.57.1.4 2013/12/25 11:40:37 kls Exp $
  */
 
 #include <getopt.h>
@@ -223,6 +223,7 @@ int main(int argc, char *argv[])
   VdrUser = VDR_USER;
 #endif
 
+  SetVideoDirectory(VideoDirectory);
   cPluginManager PluginManager(DEFAULTPLUGINDIR);
 
   static struct option long_options[] = {
@@ -443,6 +444,7 @@ int main(int argc, char *argv[])
           case 'v': VideoDirectory = optarg;
                     while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
                           optarg[strlen(optarg) - 1] = 0;
+                    SetVideoDirectory(VideoDirectory);
                     break;
           case 'w': if (isnumber(optarg)) {
                        int t = atoi(optarg);
@@ -663,7 +665,6 @@ int main(int argc, char *argv[])
 
   // Directories:
 
-  SetVideoDirectory(VideoDirectory);
   if (!ConfigDirectory)
      ConfigDirectory = DEFAULTCONFDIR;
   cPlugin::SetConfigDirectory(ConfigDirectory);