diff --git a/core/css/styles.css b/core/css/styles.css
index 2038417685c9a2c13bae4482d6117273089dd1ad..eab4e226a1173e03e948ec295ad426308ee4db80 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -383,9 +383,10 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 
 /* ---- DIALOGS ---- */
 #oc-dialog-filepicker-content .dirup {width:4%; font-weight: bold;}
-#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; font-weight: bold; }
-#oc-dialog-filepicker-content .dirtree span { cursor: pointer; }
-#oc-dialog-filepicker-content .dirtree span:not(last-child)::after { content: '>'; padding: 3px;}
+#oc-dialog-filepicker-content .dirtree {width:92%; overflow:hidden; }
+#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
+#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
+#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
 #oc-dialog-filepicker-content .filelist {height:270px; overflow-y:auto; background-color:white; width:100%;}
 #oc-dialog-filepicker-content .filelist img { margin: 2px 1em 0 4px; }
 #oc-dialog-filepicker-content .filelist .date { float:right;margin-right:1em; }
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 4da9623c0a7f21a0c2e7547251b9d2da4a145992..8f127bfb62b8be4f83fa9c3e8344d40fb0430624 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -198,7 +198,7 @@ var OCdialogs = {
 				self.$filelist = self.$filePicker.find('.filelist');
 				self.$dirUp = self.$filePicker.find('.dirup');
 				self.$dirTree = self.$filePicker.find('.dirtree');
-				self.$dirTree.on('click', 'span', self, self.handleTreeListSelect);
+				self.$dirTree.on('click', 'span:not(:last-child)', self, self.handleTreeListSelect);
 				self.$dirUp.click(self, self.filepickerDirUp);
 				self.$filelist.on('click', 'li', function(event) {
 					self.handlePickerClick(event, $(this));
@@ -393,7 +393,7 @@ var OCdialogs = {
 		}
 		var $template = $('<span data-dir="{dir}">{name}</span>');
 		var paths = path.split('/');
-		paths.pop();
+		//paths.pop();
 		$.each(paths, function(index, dir) {
 			var dir = paths.pop();
 			if(dir === '') {