diff --git a/extensions/gii/assets/gii.js b/extensions/gii/assets/gii.js
index dbbd915c87..c71332963d 100644
--- a/extensions/gii/assets/gii.js
+++ b/extensions/gii/assets/gii.js
@@ -81,15 +81,26 @@ yii.gii = (function ($) {
         });
     };
 
+    var checkAllToggle = function () {
+        $('#check-all').prop('checked', !$('.default-view-files table .check input:enabled:not(:checked)').length);
+    };
+
     var initConfirmationCheckboxes = function () {
         var $checkAll = $('#check-all');
         $checkAll.click(function () {
-            $('.default-view-files table .check input').prop('checked', this.checked);
+            $('.default-view-files table .check input:enabled').prop('checked', this.checked);
         });
         $('.default-view-files table .check input').click(function () {
-            $checkAll.prop('checked', !$('.default-view-files table .check input:not(:checked)').length);
+            checkAllToggle();
+        });
+        checkAllToggle();
+    };
+
+    var initToggleActions = function () {
+        $('#action-toggle :input').change(function () {
+            $('.' + this.value, '.default-view-files table').toggle(this.checked).find('.check input').attr('disabled', !this.checked);
+            checkAllToggle();
         });
-        $checkAll.prop('checked', !$('.default-view-files table .check input:not(:checked)').length);
     };
 
     return {
@@ -109,6 +120,7 @@ yii.gii = (function ($) {
             initStickyInputs();
             initPreviewDiffLinks();
             initConfirmationCheckboxes();
+            initToggleActions();
 
             // model generator: hide class name input when table name input contains *
             $('#model-generator #generator-tablename').change(function () {
diff --git a/extensions/gii/views/default/view/files.php b/extensions/gii/views/default/view/files.php
index 2f0499e768..885bdcf7de 100644
--- a/extensions/gii/views/default/view/files.php
+++ b/extensions/gii/views/default/view/files.php
@@ -12,6 +12,18 @@ use yii\gii\CodeFile;
  */
 ?>
 <div class="default-view-files">
+    <div id="action-toggle" class="btn-group btn-group-xs pull-right" data-toggle="buttons">
+        <label class="btn btn-success active" title="Filter files that are created">
+            <input type="checkbox" value="<?= CodeFile::OP_CREATE ?>" checked> Create
+        </label>
+        <label class="btn btn-info active" title="Filter files that are unchanged.">
+            <input type="checkbox" value="<?= CodeFile::OP_SKIP ?>" checked> Unchanged
+        </label>
+        <label class="btn btn-warning active" title="Filter files that are overwritten">
+            <input type="checkbox" value="<?= CodeFile::OP_OVERWRITE ?>" checked> Overwrite
+        </label>
+    </div>
+
     <p>Click on the above <code>Generate</code> button to generate the files selected below:</p>
 
     <table class="table table-bordered table-striped table-condensed">