--- a/src/typedefs.h	Thu Jul 06 19:33:31 2017 +0000
+++ b/src/typedefs.h	Fri Jul 07 12:32:25 2017 +0000
@@ -252,6 +252,13 @@
 
 #define MAX_SPLIT_IMAGES 4
 
+typedef enum {
+	SELECTION_NONE		= 0,
+	SELECTION_SELECTED	= 1 << 0,
+	SELECTION_PRELIGHT	= 1 << 1,
+	SELECTION_FOCUS		= 1 << 2
+} SelectionType;
+
 typedef struct _ImageLoader ImageLoader;
 typedef struct _ThumbLoader ThumbLoader;
 
@@ -879,13 +886,6 @@
 	guint select_idle_id; /* event source id */
 };
 
-typedef enum {
-	SELECTION_NONE		= 0,
-	SELECTION_SELECTED	= 1 << 0,
-	SELECTION_PRELIGHT	= 1 << 1,
-	SELECTION_FOCUS		= 1 << 2
-} SelectionType;
-
 struct _ViewFileInfoIcon
 {
 	/* table stuff */

--- a/src/view_file.c	Thu Jul 06 19:33:31 2017 +0000
+++ b/src/view_file.c	Fri Jul 07 12:32:25 2017 +0000
@@ -555,7 +555,7 @@
 		active = (VFLIST(vf)->click_fd != NULL);
 		break;
 	case FILEVIEW_ICON:
-		active = (VFICON(vf)->click_id != NULL);
+		active = (VFICON(vf)->click_fd != NULL);
 		break;
 	}
 

--- a/src/view_file/view_file_icon.c	Thu Jul 06 19:33:31 2017 +0000
+++ b/src/view_file/view_file_icon.c	Fri Jul 07 12:32:25 2017 +0000
@@ -80,14 +80,14 @@
 
 GList *vficon_pop_menu_file_list(ViewFile *vf)
 {
-	if (!VFICON(vf)->click_id) return NULL;
+	if (!VFICON(vf)->click_fd) return NULL;
 
-	if (VFICON(vf)->click_id->selected & SELECTION_SELECTED)
+	if (VFICON(vf)->click_fd->selected & SELECTION_SELECTED)
 		{
 		return vf_selection_get_list(vf);
 		}
 
-	return vficon_selection_get_one(vf, VFICON(vf)->click_id->fd);
+	return vficon_selection_get_one(vf, VFICON(vf)->click_fd);
 }
 
 void vficon_pop_menu_view_cb(GtkWidget *widget, gpointer data)
@@ -883,8 +883,7 @@
 void vficon_select_by_fd(ViewFile *vf, FileData *fd)
 {
 	if (!fd) return;
-	FileData *found_fd = g_list_find(vf->list, fd);
-	if (!found_fd) return;
+	if (!g_list_find(vf->list, fd)) return;
 
 	if (!(fd->selected & SELECTION_SELECTED))
 		{
@@ -1271,13 +1270,13 @@
 				{
 				if (!options->collections.rectangular_selection)
 					{
-					vficon_select_region_util(vf, old_id, new_fd, FALSE);
+					vficon_select_region_util(vf, old_fd, new_fd, FALSE);
 					}
 				else
 					{
 					vficon_select_region_util(vf, VFICON(vf)->click_fd, old_fd, FALSE);
 					}
-				vficon_select_region_util(vf, VFICON(vf)->click_fd, new_id, TRUE);
+				vficon_select_region_util(vf, VFICON(vf)->click_fd, new_fd, TRUE);
 				vficon_send_layout_select(vf, new_fd);
 				}
 			else if (event->state & GDK_CONTROL_MASK)
@@ -1695,7 +1694,8 @@
 	GtkTreeIter iter;
 	GList *list;
 
-	if (!vficon_find_iter(vf, g_list_find(vf->list, fd), &iter, NULL)) return;
+	if (!g_list_find(vf->list, fd)) return;
+	if (!vficon_find_iter(vf, fd, &iter, NULL)) return;
 
 	store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview));