diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java
index 8849eb1a3..8031bcc27 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheck.java
@@ -161,10 +161,7 @@ public class GenericWhitespaceCheck extends Check
                         log(aAST.getLineNo(), after, "ws.followed", ">");
                     }
                 }
-                else if ((line.charAt(after) != '>')
-                         && (line.charAt(after) != ',')
-                         && (line.charAt(after) != '['))
-                {
+                else if (line.charAt(after) == ' ') {
                     log(aAST.getLineNo(), after, "ws.followed", ">");
                 }
             }
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
index 7460696fb..afbab3915 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
@@ -83,4 +83,14 @@ public class GenericWhitespaceCheckTest
         final String[] expected = {};
         verify(mCheckConfig, getPath("whitespace/Gh47.java"), expected);
     }
+
+    @Test
+    public void testInnerClass() throws Exception
+    {
+        final String[] expected = {
+
+        };
+        verify(mCheckConfig, getPath("whitespace/"
+                + "InputGenericWhitespaceInnerClassCheck.java"), expected);
+    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputGenericWhitespaceInnerClassCheck.java b/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputGenericWhitespaceInnerClassCheck.java
new file mode 100644
index 000000000..584410bc8
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputGenericWhitespaceInnerClassCheck.java
@@ -0,0 +1,11 @@
+package com.puppycrawl.tools.checkstyle.whitespace;
+
+import java.util.List;
+
+public class InputGenericWhitespaceInnerClassCheck<T>
+{
+    private List<InputGenericWhitespaceInnerClassCheck<? extends T>.InnerClass> field;
+
+    public class InnerClass {
+    }
+}