diff --git a/www/file/app-file.less b/www/file/app-file.less
index 1e4825414..e2065d00f 100644
--- a/www/file/app-file.less
+++ b/www/file/app-file.less
@@ -3,10 +3,12 @@
 @import (once) "../../customize/src/less2/include/markdown.less";
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
+@import (once) '../../customize/src/less2/include/tokenfield.less';
 
 .toolbar_main();
 .fileupload_main();
 .alertify_main();
+.tokenfield_main();
 
 @button-border: 2px;
 
diff --git a/www/file/inner.js b/www/file/inner.js
index a71c4a7f5..55e7487a1 100644
--- a/www/file/inner.js
+++ b/www/file/inner.js
@@ -137,7 +137,8 @@ define([
                             }))
                             .append(common.createButton('forget', true, {}, function () {
                                 // not sure what to do here
-                            }));
+                            }))
+                            .append(common.createButton('hashtag', true));
                             rightsideDisplayed = true;
                         }
 
diff --git a/www/whiteboard/app-whiteboard.less b/www/whiteboard/app-whiteboard.less
index 848fd994c..b2bd789fc 100644
--- a/www/whiteboard/app-whiteboard.less
+++ b/www/whiteboard/app-whiteboard.less
@@ -4,10 +4,12 @@
 @import (once) '../../customize/src/less2/include/fileupload.less';
 @import (once) '../../customize/src/less2/include/alertify.less';
 @import (once) '../../customize/src/less2/include/tools.less';
+@import (once) '../../customize/src/less2/include/tokenfield.less';
 
 .toolbar_main();
 .fileupload_main();
 .alertify_main();
+.tokenfield_main();
 
 // body
 &.cp-app-whiteboard {
diff --git a/www/whiteboard/inner.js b/www/whiteboard/inner.js
index cd14ef9f3..972063b2e 100644
--- a/www/whiteboard/inner.js
+++ b/www/whiteboard/inner.js
@@ -409,6 +409,7 @@ define([
                 setEditable(false);
             });
             $rightside.append($forget);
+            common.createButton('hashtag', true).appendTo($rightside);
 
             if (!readOnly) {
                 makeColorButton($rightside);