diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java
index f7e0c8fbd1e145ef93efc62449d9c830dc9a5aab..6817fe67dd60104da4ff6569e9d318b13e4d4a61 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoGridFragment.java
@@ -57,6 +57,7 @@ import android.widget.TextView;
 
 import org.videolan.libvlc.Media;
 import org.videolan.libvlc.util.AndroidUtil;
+import org.videolan.vlc.BuildConfig;
 import org.videolan.vlc.MediaDatabase;
 import org.videolan.vlc.MediaGroup;
 import org.videolan.vlc.MediaLibrary;
@@ -174,6 +175,9 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
         mMediaLibrary.setBrowser(null);
         mMediaLibrary.removeUpdateHandler(mHandler);
 
+        /* Clear current deletion */
+        mDeleteHandler.removeMessages(DELETE_MEDIA);
+
         /* Stop the thumbnailer */
         if (mThumbnailer != null)
             mThumbnailer.stop();
@@ -319,7 +323,7 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
                 Snackbar.make(getView(), getString(R.string.file_deleted), DELETE_DURATION)
                     .setAction(android.R.string.cancel, mCancelDeleteMediaListener)
                     .show();
-                Message msg = mDeleteHandler.obtainMessage(DELETE_MEDIA, position, 0);
+                Message msg = mDeleteHandler.obtainMessage(DELETE_MEDIA, media.getLocation());
                 mDeleteHandler.sendMessageDelayed(msg, DELETE_DURATION);
                 return true;
         }
@@ -350,8 +354,7 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
             hasInfo = true;
         media.release();
         menu.findItem(R.id.video_list_info).setVisible(hasInfo);
-        menu.findItem(R.id.video_list_delete).setVisible(!AndroidUtil.isLolliPopOrLater() ||
-                mediaWrapper.getLocation().startsWith("file://" + AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY));
+        menu.findItem(R.id.video_list_delete).setVisible(BuildConfig.DEBUG);
     }
 
     @Override
@@ -555,8 +558,8 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
         mVideoAdapter.clear();
     }
 
-    public void deleteMedia(int position){
-        final MediaWrapper media = mVideoAdapter.getItem(position);
+    public void deleteMedia(String location){
+        final MediaWrapper media = mVideoAdapter.getItem(location);
         final String path = media.getUri().getPath();
         VLCApplication.runBackground(new Runnable() {
             public void run() {
@@ -573,7 +576,6 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
         }
     }
 
-
     View.OnClickListener mCancelDeleteMediaListener = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
@@ -594,7 +596,7 @@ public class VideoGridFragment extends MediaBrowserFragment implements ISortable
             super.handleMessage(msg);
             switch (msg.what){
                 case DELETE_MEDIA:
-                    getOwner().deleteMedia(msg.arg1);
+                    getOwner().deleteMedia(msg.obj.toString());
             }
         }
     }
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java
index 3ab1c058b085073d763fec69f5644e8c02b3c4cf..254adf602b6d170395a77a4639713d9c497de4ff 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoListAdapter.java
@@ -89,6 +89,15 @@ public class VideoListAdapter extends ArrayAdapter<MediaWrapper>
             notifyDataSetChanged();
     }
 
+    public MediaWrapper getItem(String location) {
+        for (int i = 0; i < getCount(); ++i) {
+            MediaWrapper media = getItem(i);
+            if (media.getLocation().equals(location))
+                return media;
+        }
+        return null;
+    }
+
     public int sortDirection(int sortby) {
         if (sortby == mSortBy)
             return  mSortDirection;