src/nnn.c | 18 ++++++++----------

diff --git a/src/nnn.c b/src/nnn.c
index ee870b6eee28dc116d3fff2308061aa3b9a170d5..fe5d6508ae334b0f35c9bc333ba96c9040c617fd 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -6037,7 +6037,7 @@ }
 
 static void statusbar(char *path)
 {
-	int i = 0, extnlen = 0;
+	int i = 0, len = 0;
 	char *ptr;
 	pEntry pent = &pdents[cur];
 
@@ -6051,8 +6051,8 @@ 	if (S_ISREG(pent->mode)) {
 		i = (int)(pent->nlen - 1);
 		ptr = xextension(pent->name, i);
 		if (ptr)
-			extnlen = i - (ptr - pent->name);
-		if (!ptr || extnlen > 5 || extnlen < 2)
+			len = i - (ptr - pent->name);
+		if (!ptr || len > 5 || len < 2)
 			ptr = "\b";
 	} else
 		ptr = "\b";
@@ -6106,16 +6106,14 @@ 		}
 #endif
 		if (S_ISLNK(pent->mode)) {
 			i = readlink(pent->name, g_buf, PATH_MAX);
-
 			addstr(coolsize(i >= 0 ? i : pent->size)); /* Show symlink size */
-
 			if (i > 1) { /* Show symlink target */
-				g_buf[i] = '\0';
-#ifdef ICONS_ENABLED
-				addstr(" "MD_ARROW_FORWARD);
-#else
+				int y;
+
 				addstr(" ->");
-#endif
+				getyx(stdscr, len, y);
+				i = MIN(i, xcols - y);
+				g_buf[i] = '\0';
 				addstr(g_buf);
 			}
 		} else {