diff --git a/modules/forum.module b/modules/forum.module
index d9973222eaf21891f72361a772ce74c16cf92164..cf65e1c6ecddbe73a76b9ec2abeeff49bf818f18 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -504,7 +504,7 @@ function forum_page($tid = 0) {
       $topics = forum_get_topics($tid, $sortby, $forum_per_page);
     }
 
-    print theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
+    print theme('page', theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page));
   }
   else {
     drupal_set_title(t('Warning'));
@@ -579,7 +579,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p
     $output = '';
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index d9973222eaf21891f72361a772ce74c16cf92164..cf65e1c6ecddbe73a76b9ec2abeeff49bf818f18 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -504,7 +504,7 @@ function forum_page($tid = 0) {
       $topics = forum_get_topics($tid, $sortby, $forum_per_page);
     }
 
-    print theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
+    print theme('page', theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page));
   }
   else {
     drupal_set_title(t('Warning'));
@@ -579,7 +579,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p
     $output = '';
   }
 
-  print theme('page', $output);
+  return $output;
 }
 
 /**