--- a/src/interface.c
+++ b/src/interface.c
@@ -1049,7 +1049,7 @@ char *tv_file_select(int next) {
 		post_menu(menu);
 
 		for(y = 0; items[y]; y++)
-			if(items[y]->index != index) menu_driver(menu, REQ_DOWN_ITEM);
+			if(item_index(items[y]) != index) menu_driver(menu, REQ_DOWN_ITEM);
 			else break;
 
 		if(next) {
@@ -1059,7 +1059,7 @@ char *tv_file_select(int next) {
 		}
 
 		current = current_item(menu);
-		index = current->index;
+		index = item_index(current);
 		wrefresh(wf);
 		while((ch = getch()) != 13) {
 			switch(ch) {
@@ -1091,7 +1091,7 @@ char *tv_file_select(int next) {
 					break;
 				case TD_KEY_ESCAPE:
 					current = current_item(menu);
-					index = current->index;
+					index = item_index(current);
 
 					unpost_menu(menu);
 					free_menu(menu);
@@ -1116,7 +1116,7 @@ char *tv_file_select(int next) {
 					}
 			}
 			current = current_item(menu);
-			index = current->index;
+			index = item_index(current);
 			wrefresh(wf);
 		}
 		if(strcmp("", input)) {
@@ -1126,7 +1126,7 @@ char *tv_file_select(int next) {
 		} else {
 hugehack:
 			current = current_item(menu);
-			index = current->index;
+			index = item_index(current);
 			unpost_menu(menu);
 			free_menu(menu);
 			free_items(items);
@@ -1197,11 +1197,11 @@ char *file_select() {
 		post_menu(menu);
 
 		for(y = 0; items[y]; y++)
-			if(items[y]->index != index) menu_driver(menu, REQ_DOWN_ITEM);
+			if(item_index(items[y]) != index) menu_driver(menu, REQ_DOWN_ITEM);
 			else break;
 
 		current = current_item(menu);
-		index = current->index;
+		index = item_index(current);
 		memset(&sauce_title, 0, sizeof(sauce_title));
 		memset(&sauce_group, 0, sizeof(sauce_group));
 		memset(&sauce_author, 0, sizeof(sauce_author));
@@ -1239,7 +1239,7 @@ char *file_select() {
 					break;
 				case TD_KEY_ESCAPE:
 					current = current_item(menu);
-					index = current->index;
+					index = item_index(current);
 
 					unpost_menu(menu);
 					free_menu(menu);
@@ -1264,7 +1264,7 @@ char *file_select() {
 					}
 			}
 			current = current_item(menu);
-			index = current->index;
+			index = item_index(current);
 			memset(&sauce_title, 0, sizeof(sauce_title));
 			memset(&sauce_group, 0, sizeof(sauce_group));
 			memset(&sauce_author, 0, sizeof(sauce_author));
@@ -1279,7 +1279,7 @@ char *file_select() {
 			return fname;
 		} else {
 			current = current_item(menu);
-			index = current->index;
+			index = item_index(current);
 			unpost_menu(menu);
 			free_menu(menu);
 			free_items(items);