2 files changed, 3 insertions, 12 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java
index 1bda2401f0..37a0b84094 100644
--- a/src/com/vaadin/terminal/gwt/client/Util.java
+++ b/src/com/vaadin/terminal/gwt/client/Util.java
@@ -29,7 +29,6 @@ import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
 import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
-import com.vaadin.terminal.gwt.client.ui.VOverlay;
 
 public class Util {
 
@@ -675,15 +674,6 @@ public class Util {
             browseElement = (Element) browseElement.getParentElement();
         }
 
-        if (browseElement == null) {
-            // Element is possibly inside a VOverlay
-            VOverlay overlay = findWidget(element, VOverlay.class);
-            if (overlay != null && overlay.getOwner() != null) {
-                return getConnectorForElement(client, RootPanel.get(), overlay
-                        .getOwner().getElement());
-            }
-        }
-
         return null;
     }
 
diff --git a/src/com/vaadin/terminal/gwt/client/VTooltip.java b/src/com/vaadin/terminal/gwt/client/VTooltip.java
index 38d1235c69..a3523c2013 100644
--- a/src/com/vaadin/terminal/gwt/client/VTooltip.java
+++ b/src/com/vaadin/terminal/gwt/client/VTooltip.java
@@ -15,6 +15,7 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ui.VOverlay;
 
@@ -255,8 +256,8 @@ public class VTooltip extends VOverlay {
          */
         private boolean resolveConnector(Element element) {
 
-            ComponentConnector connector = Util.getConnectorForElement(ac, ac
-                    .getRootConnector().getWidget(), element);
+            ComponentConnector connector = Util.getConnectorForElement(ac,
+                    RootPanel.get(), element);
 
             // Try to find first connector with proper tooltip info
             TooltipInfo info = null;