         })
     }
 
-    private func updateRandom(_ hintHidden: Bool) {
-        if let vc = presenter as? WMFRandomArticleViewController {
-            vc.setAdditionalSecondToolbarSpacing(hintHidden ? 0 : containerView.frame.height, animated: true)
+    private func adjustSpacingIfPresenterHasSecondToolbar() {
+        guard
+            let viewController = presenter as? WMFViewController,
+            !viewController.isSecondToolbarHidden
+        else {
+            return
         }
+        let spacing = isHintHidden ? 0 : containerView.frame.height
+        viewController.setAdditionalSecondToolbarSpacing(spacing, animated: true)
     }
 }
 

        }, completion: { (_) in
            // remove hint after animation is completed
            if hintHidden {
                self.updateRandom(hintHidden)
                self.removeHint()
            } else {
                self.dismissHint()

            addHint(to: presenter)
        }

        self.adjustSpacingIfPresenterHasSecondToolbar()

        UIView.animate(withDuration: 0.3, delay: 0, options: [.curveEaseInOut], animations: {
            if hintHidden {
