diff --git a/platform/platform-api/src/com/intellij/ui/components/JBViewport.java b/platform/platform-api/src/com/intellij/ui/components/JBViewport.java
index 76ea93e94684..15a4966a931f 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBViewport.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBViewport.java
@@ -128,7 +128,7 @@ public class JBViewport extends JViewport implements ZoomableViewport {
   @Override
   public Magnificator getMagnificator() {
     JComponent view = (JComponent)getView();
-    return view != null ? (Magnificator)view.getClientProperty(Magnificator.CLIENT_PROPERTY_KEY) : null;
+    return view != null ? UIUtil.getClientProperty(view, Magnificator.CLIENT_PROPERTY_KEY) : null;
   }
 
   @Override
diff --git a/platform/platform-api/src/com/intellij/ui/components/Magnificator.java b/platform/platform-api/src/com/intellij/ui/components/Magnificator.java
index cc60e7fbf195..0fab4cceba48 100644
--- a/platform/platform-api/src/com/intellij/ui/components/Magnificator.java
+++ b/platform/platform-api/src/com/intellij/ui/components/Magnificator.java
@@ -24,6 +24,6 @@ import com.intellij.openapi.util.Key;
 import java.awt.*;
 
 public interface Magnificator {
-  Key CLIENT_PROPERTY_KEY = Key.create("MagnifiableComponent");
+  Key<Magnificator> CLIENT_PROPERTY_KEY = Key.create("MagnifiableComponent");
   Point magnify(double scale, Point at);
 }