diff --git a/js/src/forum/components/ComposePollHero.tsx b/js/src/forum/components/ComposePollHero.tsx
index 10c882d7..69767c61 100644
--- a/js/src/forum/components/ComposePollHero.tsx
+++ b/js/src/forum/components/ComposePollHero.tsx
@@ -3,43 +3,63 @@ import app from 'flarum/forum/app';
 import Component, { ComponentAttrs } from 'flarum/common/Component';
 import LinkButton from 'flarum/common/components/LinkButton';
 import Poll from '../models/Poll';
+import ItemList from 'flarum/common/utils/ItemList';
 
 export interface ComposePollHeroAttrs extends ComponentAttrs {
   poll: Poll;
 }
 
 export default class ComposePollHero extends Component<ComposePollHeroAttrs> {
-  view(): Mithril.Children {
-    const { poll } = this.attrs;
+  poll!: Poll;
+
+  oninit(vnode: Mithril.Vnode<ComposePollHeroAttrs>): void {
+    super.oninit(vnode);
+
+    this.poll = this.attrs.poll;
+  }
 
+  view(): Mithril.Children {
     return (
       <div className="ComposeGoodieCollectionHero Hero IndexPageHero">
         <div className="container">
           <div className="containerNarrow">
-            <h2 className="Hero-title">{app.translator.trans(`fof-polls.forum.compose.${!!poll.id() ? 'edit' : 'add'}_title`)}</h2>
-            <div className="IndexPageHero-controls">
-              <LinkButton
-                icon="far fa-edit"
-                className="Button Button--secondary IndexPage-newDiscussion GoodiesManagerLink"
-                itemClassName="App-primaryControl"
-                href={app.route('fof.polls.list')}
-              >
-                {app.translator.trans('fof-polls.forum.compose.polls_manager')}
-              </LinkButton>
-              {poll.exists && (
-                <LinkButton
-                  icon="far fa-arrow-up-right-from-square"
-                  className="Button Button--secondary IndexPage-newDiscussion GoodiePreviewLink"
-                  itemClassName="App-primaryControl"
-                  href={app.route('fof.polls.view', { id: poll.id() })}
-                >
-                  {app.translator.trans('fof-polls.forum.compose.polls_preview')}
-                </LinkButton>
-              )}
-            </div>
+            <h2 className="Hero-title">{app.translator.trans(`fof-polls.forum.compose.${!!this.poll.id() ? 'edit' : 'add'}_title`)}</h2>
+            <div className="IndexPageHero-controls">{this.controlItems().toArray()}</div>
           </div>
         </div>
       </div>
     );
   }
+
+  controlItems(): ItemList<Mithril.Children> {
+    const items = new ItemList<Mithril.Children>();
+
+    items.add(
+      'edit',
+      <LinkButton
+        icon="far fa-edit"
+        className="Button Button--secondary IndexPage-newDiscussion GoodiesManagerLink"
+        itemClassName="App-primaryControl"
+        href={app.route('fof.polls.list')}
+      >
+        {app.translator.trans('fof-polls.forum.compose.polls_manager')}
+      </LinkButton>
+    );
+
+    if (this.poll.exists) {
+      items.add(
+        'view',
+        <LinkButton
+          icon="far fa-arrow-up-right-from-square"
+          className="Button Button--secondary IndexPage-newDiscussion GoodiePreviewLink"
+          itemClassName="App-primaryControl"
+          href={app.route('fof.polls.view', { id: this.poll.id() })}
+        >
+          {app.translator.trans('fof-polls.forum.compose.polls_preview')}
+        </LinkButton>
+      );
+    }
+
+    return items;
+  }
 }
diff --git a/js/src/forum/components/index.ts b/js/src/forum/components/index.ts
index 19cc5224..bcd3dd0a 100644
--- a/js/src/forum/components/index.ts
+++ b/js/src/forum/components/index.ts
@@ -3,6 +3,11 @@ import PostPoll from './PostPoll';
 import EditPollModal from './EditPollModal';
 import ListVotersModal from './ListVotersModal';
 import PollForm from './PollForm';
+import ComposePollHero from './ComposePollHero';
+import ComposePollPage from './ComposePollPage';
+import PollsPage from './PollsPage';
+import PollView from './PollView';
+import PollViewPage from './PollViewPage';
 
 export const components = {
   CreatePollModal,
@@ -10,4 +15,9 @@ export const components = {
   EditPollModal,
   ListVotersModal,
   PollForm,
+  ComposePollHero,
+  ComposePollPage,
+  PollsPage,
+  PollView,
+  PollViewPage,
 };