diff --git a/pmd/src/net/sourceforge/pmd/PMD.java b/pmd/src/net/sourceforge/pmd/PMD.java
index be57e595a0..4fa9ce8172 100644
--- a/pmd/src/net/sourceforge/pmd/PMD.java
+++ b/pmd/src/net/sourceforge/pmd/PMD.java
@@ -13,7 +13,9 @@ import net.sourceforge.pmd.renderers.Renderer;
 import net.sourceforge.pmd.renderers.XMLRenderer;
 import net.sourceforge.pmd.renderers.HTMLRenderer;
 import net.sourceforge.pmd.swingui.PMDFrame;
+import net.sourceforge.pmd.swingui.viewer.PMDViewer;
 
+import javax.swing.*;
 import java.io.*;
 import java.util.List;
 import java.util.Iterator;
@@ -54,7 +56,14 @@ public class PMD {
 
     public static void main(String[] args) {
         if (args[0].equals("-g")) {
-            new PMDFrame();
+            try {
+                UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+                PMDViewer pmdViewer = new PMDViewer();
+                pmdViewer.setVisible(true);
+                pmdViewer.setupFiles();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             return;
         }
 
diff --git a/pmd/src/net/sourceforge/pmd/swingui/viewer/PMDViewer.java b/pmd/src/net/sourceforge/pmd/swingui/viewer/PMDViewer.java
index ee0da7408e..df8ecbaf51 100644
--- a/pmd/src/net/sourceforge/pmd/swingui/viewer/PMDViewer.java
+++ b/pmd/src/net/sourceforge/pmd/swingui/viewer/PMDViewer.java
@@ -22,7 +22,7 @@ public class PMDViewer extends JFrame
      *******************************************************************************
      *
      */
-    private PMDViewer()
+    public PMDViewer()
     {
         super("PMD Viewer");
 
@@ -166,7 +166,7 @@ public class PMDViewer extends JFrame
      *
      * @param args
      */
-    private void setupFiles()
+    public void setupFiles()
     {
         m_directoryTree.setupFiles();
     }