diff --git a/mod/filestorage.php b/mod/filestorage.php
index 18760dd45..3e53a1e93 100644
--- a/mod/filestorage.php
+++ b/mod/filestorage.php
@@ -69,7 +69,6 @@ function filestorage_content(&$a) {
 		return;
 	}
 
-	// 	TODO This will also need to check for files on disk and delete them from there as well as the DB.
 
 	if(argc() > 3 && argv(3) === 'delete') {
 		if(! $perms['write_storage']) {
@@ -110,7 +109,7 @@ function filestorage_content(&$a) {
 
 		$channel = $a->get_channel();
 
-		$cloudpath = get_cloudpath($f);
+		$cloudpath = get_cloudpath($f) . (($f['flags'] & ATTACH_FLAG_DIR) ? '?f=&davguest=1' : '');
 
 		$aclselect_e = populate_acl($f);
 		$is_a_dir = (($f['flags'] & ATTACH_FLAG_DIR) ? true : false);
diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index f9c6e96ce..77f32b5bc 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -23,12 +23,11 @@
 {{else}}
 <div class="cut-paste-desc">{{$cpdesc}}</div>
 <input type="text" id="cutpasteinput" name="cutpastelink" value="[attachment]{{$file.hash}},{{$file.revision}}[/attachment]" onclick="this.select();" /><br />
+{{/if}}
 
 <div class="cut-paste-desc">{{$cpldesc}}</div>
 <input type="text" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/><br />
 
-{{/if}}
-
 <div id="attach-edit-perms" >
 {{$aclselect}}
 </div>