diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index 68e544cc82f8..9e8ae7915aec 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -1158,8 +1158,6 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
         panel.remove(0);
         panel.add(hintComponent);
       }
-      //todo[kirillk] comment the following line
-      HintManagerImpl.adjustEditorHintPosition(myAutopopupHint, editor, bestPoint);
     }
   }
 
diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
index e8abfbfcd70b..c9291dc10394 100644
--- a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
@@ -369,7 +369,7 @@ public class HintManagerImpl extends HintManager implements Disposable {
       p = rectangle.getLocation();
       SwingUtilities.convertPointFromScreen(p, layeredPane);
     }
-    else if ((layeredPane.getWidth() < p.x + size.width) && !hintInfo.isAwtTooltip()) {
+    else if ((layeredPane.getWidth() < p.x + size.width) && !hintInfo.isAwtTooltip() && !hint.isRealPopup()) {
       p.x = Math.max(0, layeredPane.getWidth() - size.width);
     }
 
diff --git a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
index 8743c13f8324..a95522649c04 100644
--- a/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
+++ b/platform/platform-impl/src/com/intellij/ui/LightweightHint.java
@@ -185,11 +185,11 @@ public class LightweightHint extends UserDataHolderBase implements Hint {
         .setMovable(myTitle != null)
         .setTitle(myTitle)
         .setModalContext(false)
-        .setShowShadow(!myForceLightweightPopup && myForceShowAsPopup)
+        .setShowShadow(isRealPopup())
         .setCancelKeyEnabled(false)
         .setCancelOnClickOutside(myCancelOnClickOutside)
         .setCancelOnOtherWindowOpen(myCancelOnOtherWindowOpen)
-        .setForceHeavyweight(!myForceLightweightPopup && myForceShowAsPopup)
+        .setForceHeavyweight(!myForceLightweightPopup && isRealPopup())
         .createPopup();
 
       beforeShow();
@@ -241,7 +241,7 @@ public class LightweightHint extends UserDataHolderBase implements Hint {
   }
 
   public final boolean isRealPopup() {
-    return myIsRealPopup;
+    return myIsRealPopup | myForceShowAsPopup;
   }
 
   public void hide() {
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 7e58a12cb257..314156f91f45 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -35,7 +35,7 @@ ide.debugMode=false
 ide.debugMode.description=Record additonal information to make bug reports more informative
 ide.forcedShowTooltip=alt
 ide.forcedShowTooltip.description=Shortcut for forced show tooltip
-ide.popup.dropShadow=false
+ide.popup.dropShadow=true
 ide.consumeKnownToolkitBugs=true
 
 ide.appIcon.progress=true