diff --git a/mod/wiki/admin.php b/mod/wiki/admin.php
index f4190481098..73cead33b7c 100644
--- a/mod/wiki/admin.php
+++ b/mod/wiki/admin.php
@@ -285,7 +285,12 @@
         while(list($key,$val)=each($wiki_list)) {
           $wiki_admin_list[$key."&action=$action"]=$val;
         }
-        choose_from_menu($wiki_admin_list, "wikiselect", $selected, "choose", $script);
+        $selectmenu = new moodle_select_menu();
+        $selectmenu->options = $wiki_admin_list;
+        $selectmenu->name = 'wikiselect';
+        $selectmenu->selectedvalue = $selected;
+        $selectmenu->add_action('change', 'go_to_wiki');
+        echo $OUTPUT->select_menu($selectmenu);
         echo '</td>';
         echo '</tr></table>';
         echo '</fieldset></form>';
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index dbc4ef710e6..785ea9c1963 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -300,8 +300,12 @@
 
         echo '<td class="sideblockheading">'
             .get_string('otherwikis', 'wiki').':&nbsp;&nbsp;';
-        $script = 'self.location=getElementById(\'otherwikis\').wikiselect.options[getElementById(\'otherwikis\').wikiselect.selectedIndex].value';
-        choose_from_menu($wiki_list, "wikiselect", $selected, "choose", $script);
+        $selectmenu = new moodle_select_menu();
+        $selectmenu->options = $wiki_list;
+        $selectmenu->name = 'wikiselect';
+        $selectmenu->selectedvalue = $selected;
+        $selectmenu->add_action('change', 'go_to_wiki');
+        echo $OUTPUT->select_menu($selectmenu);
         echo '</td>';
         echo '</tr></table>';
         echo '</form>';
diff --git a/mod/wiki/wiki.js b/mod/wiki/wiki.js
new file mode 100644
index 00000000000..db737d0bcf9
--- /dev/null
+++ b/mod/wiki/wiki.js
@@ -0,0 +1,3 @@
+function go_to_wiki(e, args) {
+    self.location = e.target.value;
+}