diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspectionBase.java
index 64fcaa666c83..6c3cf389463e 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspectionBase.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspectionBase.java
@@ -34,7 +34,7 @@ public class ParameterHidingMemberVariableInspectionBase extends BaseInspection
   public boolean m_ignoreInvisibleFields = true;
 
   @SuppressWarnings("PublicField")
-  public boolean m_ignoreStaticMethodParametersHidingInstanceFields = false;
+  public boolean m_ignoreStaticMethodParametersHidingInstanceFields = true;
 
   @SuppressWarnings("PublicField")
   public boolean m_ignoreForConstructors = false;
@@ -150,6 +150,9 @@ public class ParameterHidingMemberVariableInspectionBase extends BaseInspection
             (!m_ignoreInvisibleFields || ClassUtils.isFieldVisible(field, aClass))) {
           return aClass;
         }
+        if (aClass.hasModifierProperty(PsiModifier.STATIC) && m_ignoreStaticMethodParametersHidingInstanceFields) {
+          return null;
+        }
         aClass = ClassUtils.getContainingClass(aClass);
       }
       return null;
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/ParameterHidingMemberVariable.html b/plugins/InspectionGadgets/src/inspectionDescriptions/ParameterHidingMemberVariable.html
index 6c713d638683..d8fa5f3bcc68 100644
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/ParameterHidingMemberVariable.html
+++ b/plugins/InspectionGadgets/src/inspectionDescriptions/ParameterHidingMemberVariable.html
@@ -5,6 +5,18 @@ or surrounding classes if it is a parameter inside of an inner or anonymous clas
 Such a parameter name may be confusing.
 <!-- tooltip end -->
 <p>
+Use the first checkbox to ignore parameters of simple setters.
+<p>
+Use the second checkbox to ignore for private fields in a superclass, which are not visible from the parameter.
+<p>
+Use the third checkbox to ignore parameters of constructors.
+<p>
+Use the fourth checkbox to ignore parameters of abstract methods.
+<p>
+Use the fifth checkbox to ignore parameters of <b>static</b> methods hiding an instance field and
+to ignore parameters of instance methods in static inner classes hiding an instance field in an outer class.
+While not strictly hiding, such parameters can still be confusing.
+<p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/parameter_hiding_member_variable/ParameterHidingMemberVariable.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/parameter_hiding_member_variable/ParameterHidingMemberVariable.java
index 699f99b1ede5..6cde0e40edfd 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/parameter_hiding_member_variable/ParameterHidingMemberVariable.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/visibility/parameter_hiding_member_variable/ParameterHidingMemberVariable.java
@@ -34,4 +34,13 @@ public class ParameterHidingMemberVariable
     public static void setBar2(int bar) {
         System.out.println(bar);
     }
+
+    int i;
+
+    class X {
+        void m(int <warning descr="Parameter 'i' hides field in class 'ParameterHidingMemberVariable'">i</warning>) {}
+    }
+    static class Y {
+        void a(int i) {}
+    }
 }