diff --git a/extensions/gii/assets/gii.js b/extensions/gii/assets/gii.js
index bf73a381c7..c9ab19875e 100644
--- a/extensions/gii/assets/gii.js
+++ b/extensions/gii/assets/gii.js
@@ -146,17 +146,6 @@ yii.gii = (function ($) {
             initConfirmationCheckboxes();
             initToggleActions();
 
-            // hide message category when I18N is disabled
-            $('form #generator-enablei18n').change(function () {
-                $('form .field-generator-messagecategory').toggle($(this).is(':checked'));
-            }).change();
-
-            // hide Generate button if any input is changed
-            $('.default-view .form-group input,select,textarea').change(function () {
-                $('.default-view-results,.default-view-files').hide();
-                $('.default-view button[name="generate"]').hide();
-            });
-
             // model generator: hide class name input when table name input contains *
             $('#model-generator #generator-tablename').change(function () {
                 $('.field-generator-modelclass').toggle($(this).val().indexOf('*') == -1);
@@ -175,6 +164,17 @@ yii.gii = (function ($) {
                 }
             });
 
+            // hide message category when I18N is disabled
+            $('form #generator-enablei18n').change(function () {
+                $('form .field-generator-messagecategory').toggle($(this).is(':checked'));
+            }).change();
+
+            // hide Generate button if any input is changed
+            $('.default-view .form-group input,select,textarea').change(function () {
+                $('.default-view-results,.default-view-files').hide();
+                $('.default-view button[name="generate"]').hide();
+            });
+
             $('.module-form #generator-moduleclass').change(function () {
                 var value = $(this).val().match(/(\w+)\\\w+$/);
                 var $idInput = $('#generator-moduleid');