diff --git a/mod/wiki/index.php b/mod/wiki/index.php
index bf416b36944..7924ac5db61 100644
--- a/mod/wiki/index.php
+++ b/mod/wiki/index.php
@@ -27,6 +27,8 @@
 
     print_header_simple("$strwikis", "", "$strwikis", "", "", true, "", navmenu($course));
 
+    echo '<div id="wiki-index" class="mwiki">';  // wiki-index wrapper start
+
 /// Get all the appropriate data
 
     if (! $wikis = get_all_instances_in_course("wiki", $course)) {
@@ -99,6 +101,8 @@
 
 /// Finish the page
 
+    echo '</div>';  // wiki-index wrapper end
+
     print_footer($course);
 
 ?>
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 22d18c28a54..b193d16358e 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -232,6 +232,8 @@
 
 
     /// Print Page
+    echo '    <div id="wikiPageActions">
+    ';
 
     /// The top row contains links to other wikis, if applicable.
     if ($wiki_list = wiki_get_other_wikis($wiki, $USER, $course, $wiki_entry->id)) {
@@ -292,6 +294,10 @@
         echo '</tr></table>';
     }
 
+    echo '</div>
+    <div id="wiki-view" class="mwiki">
+    ';
+
     if($ewiki_title==$wiki_entry->pagename && !empty($wiki->summary)) {
       if (trim(strip_tags($wiki->summary))) {
           print "<br />";
@@ -342,5 +348,9 @@
     echo "<br clear=\"all\" />";
 
 /// Finish the page
+    echo '
+    </div>
+    ';
+
     print_footer($course);
 ?>