diff --git a/system/classes/language.class.php b/system/classes/language.class.php
index 51252fade..d4582a10c 100644
--- a/system/classes/language.class.php
+++ b/system/classes/language.class.php
@@ -295,7 +295,7 @@ public static function adminShowList()
         );
         $textArray = array(
             'has_extras' => true,
-            'title'      => $LANG_LANG['language_editor'],
+            'form_url'   => $_CONF['site_admin_url'] . '/language.php',
         );
         $queryArray = array(
             'sql'         => "SELECT * FROM {$_TABLES['language_items']} ",
@@ -320,6 +320,7 @@ public static function adminShowList()
             'language_items', __CLASS__ . '::fieldFunction', $headerArray, $textArray,
             $queryArray, $defaultSortArray, $filter, $extra, $options, $formArray, true, $pageNavUrl
         );
+        $content .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
         $display = COM_createHTMLDocument($content, array('pagetitle' => $LANG_LANG['language_editor']));
         COM_output($display);
     }