nnn.c | 10 ++++------

diff --git a/nnn.c b/nnn.c
index 56a6e32de5e9bc740b45e89d516756f1c367e870..c23e15824624454f844f6f133c3fb7a22a207714 100644
--- a/nnn.c
+++ b/nnn.c
@@ -508,6 +508,8 @@ 	nonl();
 	intrflush(stdscr, FALSE);
 	keypad(stdscr, TRUE);
 	curs_set(FALSE); /* Hide cursor */
+	start_color();
+	use_default_colors();
 	timeout(1000); /* One second */
 }
 
@@ -1286,12 +1288,7 @@ 	oldpath[0] = '\0';
 	newpath[0] = '\0';
 	lastdir[0] = '\0'; /* Can't move back from initial directory */
 begin:
-
-	if (sel == SEL_GOIN && S_ISDIR(sb.st_mode))
-		r = populate(path, NULL, fltr);
-	else
-		r = populate(path, oldpath, fltr);
-	if (r == -1) {
+	if (populate(path, oldpath, fltr) == -1) {
 		printwarn();
 		goto nochange;
 	}
@@ -1375,6 +1372,7 @@ 				/* Save last working directory */
 				xstrlcpy(lastdir, path, sizeof(lastdir));
 
 				xstrlcpy(path, newpath, sizeof(path));
+				oldpath[0] = '\0';
 				/* Reset filter */
 				xstrlcpy(fltr, ifilter, sizeof(fltr));
 				goto begin;