diff --git a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java
index 5531017..51397e7 100644
--- a/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java
+++ b/extras/src/main/java/edu/umd/cs/piccolox/pswing/PSwing.java
@@ -42,8 +42,6 @@
 import java.awt.event.ContainerAdapter;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
-import java.awt.event.HierarchyBoundsAdapter;
-import java.awt.event.HierarchyEvent;
 import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -319,19 +317,13 @@
         component.putClientProperty(PSWING_PROPERTY, this);
         initializeComponent(component);
 
-        component.revalidate();
+        //TODO: this listener is suspicious, it's not listening for any specific property
         component.addPropertyChangeListener(new PropertyChangeListener() {
             /** {@inheritDoc} */
             public void propertyChange(final PropertyChangeEvent evt) {
                 updateBounds();
             }
         });
-        component.addHierarchyBoundsListener(new HierarchyBoundsAdapter() {
-            /** {@inheritDoc} */
-            public void ancestorResized(HierarchyEvent arg0) {
-                updateBounds();
-            }
-        });
 
         updateBounds();
         listenForCanvas(this);
@@ -356,6 +348,7 @@
         // TODO: should we make sure this is called at least once
         // TODO: does this sometimes need to be called when size already equals
         // preferred size, to relayout/update things?
+        component.revalidate();
         if (componentNeedsResizing()) {
             component.setBounds(0, 0, component.getPreferredSize().width, component.getPreferredSize().height);
         }