diff --git a/templates/partials/fork_thread_modal.tpl b/templates/partials/fork_thread_modal.tpl
index a4ad5d0..c707ac8 100644
--- a/templates/partials/fork_thread_modal.tpl
+++ b/templates/partials/fork_thread_modal.tpl
@@ -1,4 +1,4 @@
-<div id="fork-thread-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+<div id="fork-thread-modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
diff --git a/templates/partials/move_post_modal.tpl b/templates/partials/move_post_modal.tpl
index db8ee88..4618619 100644
--- a/templates/partials/move_post_modal.tpl
+++ b/templates/partials/move_post_modal.tpl
@@ -1,4 +1,4 @@
-<div id="move-post-modal" class="hide" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+<div id="move-post-modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
diff --git a/templates/partials/move_thread_modal.tpl b/templates/partials/move_thread_modal.tpl
index 4b49b58..f86daa4 100644
--- a/templates/partials/move_thread_modal.tpl
+++ b/templates/partials/move_thread_modal.tpl
@@ -6,7 +6,8 @@
 				<h3>[[topic:move_topic]]</h3>
 			</div>
 			<div class="modal-body">
-				<p id="categories-loading"><i class="fa fa-spin fa-refresh"></i> [[topic:load_categories]]</p>
+				<!-- IMPORT partials/category_list.tpl -->
+
 				<p>
 					[[topic:disabled_categories_note]]
 				</p>
diff --git a/templates/topic.tpl b/templates/topic.tpl
index 5386506..38a776d 100644
--- a/templates/topic.tpl
+++ b/templates/topic.tpl
@@ -52,9 +52,6 @@
 		<!-- IMPORT partials/paginator.tpl -->
 	<!-- ENDIF config.usePagination -->
 
-	<!-- IMPORT partials/move_thread_modal.tpl -->
-	<!-- IMPORT partials/fork_thread_modal.tpl -->
-	<!-- IMPORT partials/move_post_modal.tpl -->
 </div>
 
 <!-- IF !config.usePagination -->