noice.c | 11 ++++++++++-

diff --git a/noice.c b/noice.c
index d78cf5e951858368852c305d38a6c7be994bb718..384598096c45c24f2aa7308a641dcb4dd9b9d11f 100644
--- a/noice.c
+++ b/noice.c
@@ -6,6 +6,7 @@ #include <fcntl.h>
 #include <dirent.h>
 #include <curses.h>
 #include <libgen.h>
+#include <limits.h>
 #include <locale.h>
 #include <regex.h>
 #include <stdlib.h>
@@ -613,8 +614,16 @@
 int
 main(int argc, char *argv[])
 {
-	char *ipath = argv[1] != NULL ? argv[1] : "/";
+	char cwd[PATH_MAX], *ipath;
 	char *ifilter = "^[^.].*"; /* Hide dotfiles */
+
+	if (argv[1] != NULL) {
+		ipath = argv[1];
+	} else {
+		ipath = getcwd(cwd, sizeof(cwd));
+		if (ipath == NULL)
+			ipath = "/";
+	}
 
 	/* Test initial path */
 	if (!testopendir(ipath))