diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
index fdc4401f6..ccbcba571 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
@@ -9,7 +9,7 @@ import ComposerOptions from '../../composer/options';
 import ComposerPublisher from '../../composer/publisher';
 import ComposerTextarea from '../../composer/textarea';
 import ComposerUploadForm from '../../composer/upload_form';
-import ComposerPollForm from '../../composer/poll_form';
+import PollFormContainer from '../containers/poll_form_container';
 import WarningContainer from '../containers/warning_container';
 import ReplyIndicatorContainer from '../containers/reply_indicator_container';
 
@@ -382,9 +382,7 @@ class ComposeForm extends ImmutablePureComponent {
               handleRef={handleRefUploadForm}
             />
           ) : null}
-          {!!poll && (
-            <ComposerPollForm />
-          )}
+          <PollFormContainer />
         </div>
         <ComposerOptions
           acceptContentTypes={acceptContentTypes}
diff --git a/app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js b/app/javascript/flavours/glitch/features/compose/components/poll_form.js
similarity index 100%
rename from app/javascript/flavours/glitch/features/composer/poll_form/components/poll_form.js
rename to app/javascript/flavours/glitch/features/compose/components/poll_form.js
diff --git a/app/javascript/flavours/glitch/features/composer/poll_form/index.js b/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
similarity index 87%
rename from app/javascript/flavours/glitch/features/composer/poll_form/index.js
rename to app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
index 5232c3b31..01df024c8 100644
--- a/app/javascript/flavours/glitch/features/composer/poll_form/index.js
+++ b/app/javascript/flavours/glitch/features/compose/containers/poll_form_container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
-import PollForm from './components/poll_form';
-import { addPollOption, removePollOption, changePollOption, changePollSettings } from '../../../actions/compose';
+import PollForm from '../components/poll_form';
+import { addPollOption, removePollOption, changePollOption, changePollSettings } from 'flavours/glitch/actions/compose';
 
 const mapStateToProps = state => ({
   options: state.getIn(['compose', 'poll', 'options']),