1 files changed, 12 insertions, 4 deletions
diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java
index b347576b22..90c60edc6e 100644
--- a/server/src/com/vaadin/ui/PopupView.java
+++ b/server/src/com/vaadin/ui/PopupView.java
@@ -61,6 +61,11 @@ public class PopupView extends AbstractComponent implements HasComponents {
 
     /* Constructors */
 
+    private PopupView() {
+        registerRpc(rpc);
+        setHideOnMouseOut(true);
+    }
+
     /**
      * A simple way to create a PopupPanel. Note that the minimal representation
      * may not be dynamically updated, in order to achieve this create your own
@@ -94,9 +99,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
      *            the PopupView.Content that contains the information for this
      */
     public PopupView(PopupView.Content content) {
-        super();
-        registerRpc(rpc);
-        setHideOnMouseOut(true);
+        this();
         setContent(content);
     }
 
@@ -185,7 +188,7 @@ public class PopupView extends AbstractComponent implements HasComponents {
      * @return true if the popup is hidden on mouse out, false otherwise
      */
     public boolean isHideOnMouseOut() {
-        return getState().hideOnMouseOut;
+        return getState(false).hideOnMouseOut;
     }
 
     /**
@@ -234,6 +237,11 @@ public class PopupView extends AbstractComponent implements HasComponents {
         return (PopupViewState) super.getState();
     }
 
+    @Override
+    protected PopupViewState getState(boolean markAsDirty) {
+        return (PopupViewState) super.getState(markAsDirty);
+    }
+
     /**
      * Used to deliver customized content-packages to the PopupView. These are
      * dynamically loaded when they are redrawn. The user must take care that