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 c63359b27..6408db280 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
@@ -126,7 +126,8 @@ public class GenericWhitespaceCheck extends Check
                     }
                 }
                 else if ((line.charAt(after) != '>')
-                         && (line.charAt(after) != ','))
+                         && (line.charAt(after) != ',')
+                         && (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 c156f4fa3..7460696fb 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
@@ -76,4 +76,11 @@ public class GenericWhitespaceCheckTest
                 getPath("whitespace/InputGenericWhitespaceCheck.java"),
                 expected);
     }
+
+    @Test
+    public void testGh47() throws Exception
+    {
+        final String[] expected = {};
+        verify(mCheckConfig, getPath("whitespace/Gh47.java"), expected);
+    }
 }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/Gh47.java b/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/Gh47.java
new file mode 100644
index 000000000..f465d7954
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/Gh47.java
@@ -0,0 +1,9 @@
+package com.puppycrawl.tools.checkstyle.whitespace;
+
+import java.util.List;
+
+public class Gh47
+{
+    public List<List<String>[]> listOfListOFArrays;
+}
+