diff --git a/mod/filestorage.php b/mod/filestorage.php
index 1063de256..4fa3c4182 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -138,8 +138,8 @@ function filestorage_content(&$a) {
 				'download' => $rr['hash'], 
 				'title' => $rr['filename'], 
 				'size' => $rr['filesize'],
-				'rev' => $rr['revision']
-
+				'rev' => $rr['revision'],
+				'dir' => (($rr['flags'] & ATTACH_FLAG_DIR) ? true : false)
 			);
 		} 
 	}
diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl
index 7decd5ea6..0089f7918 100644
--- a/view/tpl/filestorage.tpl
+++ b/view/tpl/filestorage.tpl
@@ -10,7 +10,7 @@
 					<a href="{{$baseurl}}/{{$item.id}}/edit">{{$edit}}</a> |
 					<a href="{{$baseurl}}/{{$item.id}}/delete">{{$delete}}</a> |
 					[attachment]{{$item.download}},{{$item.rev}}[/attachment] |
-					<a href="attach/{{$item.download}}">{{$item.title}}</a> | 
+					{{if ! $item.dir}}<a href="attach/{{$item.download}}">{{/if}}{{$item.title}}{{if ! $item.dir}}</a>{{/if}} | 
 					{{$item.size}} bytes
 
 </div>