diff --git a/app/src/main/java/gq/cyuubi/lightswitch/FileAdapter.java b/app/src/main/java/gq/cyuubi/lightswitch/FileAdapter.java
index 0cee1f22..0eb78811 100644
--- a/app/src/main/java/gq/cyuubi/lightswitch/FileAdapter.java
+++ b/app/src/main/java/gq/cyuubi/lightswitch/FileAdapter.java
@@ -100,9 +100,9 @@ public class FileAdapter extends ArrayAdapter<GameItem> implements View.OnClickL
         Bitmap icon = dataModel.getIcon();
         if(icon!=null) {
             viewHolder.icon.setImageBitmap(icon);
+            viewHolder.icon.setOnClickListener(this);
+            viewHolder.icon.setTag(position);
         }
-        viewHolder.icon.setOnClickListener(this);
-        viewHolder.icon.setTag(position);
         return convertView;
     }