diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/WebConsolePluginAdapter.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/WebConsolePluginAdapter.java
index c61c5bf..2d1c57c 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/WebConsolePluginAdapter.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/WebConsolePluginAdapter.java
@@ -184,7 +184,13 @@
     protected boolean isHtmlRequest( final HttpServletRequest request )
     {
         final String requestUri = request.getRequestURI();
-        return requestUri.endsWith( ".html" ) || requestUri.lastIndexOf( '.' ) < 0;
+        if ( requestUri.endsWith( ".html" ) ) {
+            return true;
+        }
+        // check if there is an extension
+        final int lastSlash = requestUri.lastIndexOf('/');
+        final int lastDot = requestUri.indexOf('.', lastSlash + 1);
+        return lastDot < 0;
     }