diff --git a/src/PluginContainer.js b/src/PluginContainer.js
index 6595039a9..969d10c17 100644
--- a/src/PluginContainer.js
+++ b/src/PluginContainer.js
@@ -108,7 +108,7 @@ class PluginContainer extends Component<Props, State> {
     if (ref && target) {
       activateMenuItems(ref);
       ref._init();
-      this.props.logger.trackTimeSince(`activePlugin-${ref.id}`);
+      this.props.logger.trackTimeSince(`activePlugin-${ref.constructor.id}`);
       this.plugin = ref;
     }
   };
diff --git a/src/dispatcher/tracking.js b/src/dispatcher/tracking.js
index a7bb4ac13..ad4575b2d 100644
--- a/src/dispatcher/tracking.js
+++ b/src/dispatcher/tracking.js
@@ -18,8 +18,9 @@ export default (store: Store, logger: Logger) => {
   ) {
     const now = performance.now();
     requestAnimationFrame(() => droppedFrameDetection(now, isWindowFocused));
-    if (isWindowFocused()) {
-      droppedFrames += Math.max(0, Math.round(now - past / (1000 / 60) - 1));
+    const dropped = Math.round((now - past) / (1000 / 60) - 1);
+    if (dropped > 0 && isWindowFocused()) {
+      droppedFrames += dropped;
     }
   }