diff -upr caja/libcaja-private/caja-icon-container.c caja-test/libcaja-private/caja-icon-container.c
--- caja/libcaja-private/caja-icon-container.c	2015-06-17 23:36:46.586908236 +0200
+++ caja-test/libcaja-private/caja-icon-container.c	2015-06-20 20:20:46.695689397 +0200
@@ -4833,7 +4833,12 @@ clicked_within_double_click_interval (Ca
     last_click_time = current_time;
 
     /* Only allow double click */
-    return (click_count == 1);
+    if (click_count == 1) {
+            click_count = 0;
+            return TRUE;
+    } else {
+            return FALSE;
+    }
 }
 
 static void