diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 04ae39460..b5fd60f62 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -32,6 +32,15 @@
     @include('layouts.partial.nav')
     <main id="content">
         @yield('content')
+        @if(Auth::check())
+        <div class="modal pr-0" tabindex="-1" role="dialog" id="composeModal">
+          <div class="modal-dialog" role="document">
+            <div class="modal-content">
+              <compose-modal></compose-modal>
+            </div>
+          </div>
+        </div>
+        @endif
     </main>
     @include('layouts.partial.footer')
     <script type="text/javascript" src="{{ mix('js/app.js') }}"></script>
@@ -60,13 +69,6 @@
             </ul>
         </div>
     </div>
-    <div class="modal" tabindex="-1" role="dialog" id="composeModal">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          @include('timeline.partial.new-form')
-        </div>
-      </div>
-    </div>
     @endif
 </body>
 </html>