diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index c0f569de351d164a775627c3b664627311650505..844a95e1216b9581dbc26122e8361ac009b2ea99 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -6,12 +6,13 @@ $(document).ready(function() {
 		FileActions.setDefault('image','View');
 	}
 	OC.search.customResults.Images=function(row,item){
-		var image=item.link.substr(item.link.indexOf('file=')+5);
+		var image=item.link.substr(item.link.indexOf('?file=')+6);
 		var a=row.find('a');
 		a.attr('href','#');
 		a.click(function(){
-			var file=image.split('/').pop();
-			var dir=image.substr(0,image.length-file.length-1);
+			var pos=image.lastIndexOf('/')
+			var file=image.substr(pos);
+			var dir=image.substr(0,pos);
 			viewImage(dir,file);
 		});
 	}