diff --git a/Perspex.Controls/Button.cs b/Perspex.Controls/Button.cs
index 494fd5a983..401aa7dc51 100644
--- a/Perspex.Controls/Button.cs
+++ b/Perspex.Controls/Button.cs
@@ -27,6 +27,7 @@ namespace Perspex.Controls
         static Button()
         {
             FocusableProperty.OverrideDefaultValue(typeof(Button), true);
+            ClickEvent.AddClassHandler<Button>(x => x.OnClick);
         }
 
         public event EventHandler<RoutedEventArgs> Click
@@ -51,7 +52,7 @@ namespace Perspex.Controls
             return base.ArrangeOverride(finalSize);
         }
 
-        protected virtual void OnClick()
+        protected virtual void OnClick(RoutedEventArgs e)
         {
         }
 
@@ -85,8 +86,6 @@ namespace Perspex.Controls
 
         private void RaiseClickEvent()
         {
-            this.OnClick();
-
             RoutedEventArgs click = new RoutedEventArgs
             {
                 RoutedEvent = ClickEvent,
diff --git a/Perspex.Controls/DropDown.cs b/Perspex.Controls/DropDown.cs
index 69b7ea0da7..ee1a03f1a3 100644
--- a/Perspex.Controls/DropDown.cs
+++ b/Perspex.Controls/DropDown.cs
@@ -67,7 +67,10 @@ namespace Perspex.Controls
 
         protected override void OnPointerPressed(PointerPressEventArgs e)
         {
-            this.IsDropDownOpen = !this.IsDropDownOpen;
+            if (!this.IsDropDownOpen)
+            {
+                this.IsDropDownOpen = true;
+            }
         }
 
         protected override void OnTemplateApplied()
diff --git a/Perspex.Controls/Popup.cs b/Perspex.Controls/Popup.cs
index f872397acf..e0ef087c7d 100644
--- a/Perspex.Controls/Popup.cs
+++ b/Perspex.Controls/Popup.cs
@@ -91,9 +91,8 @@ namespace Perspex.Controls
             }
 
             this.popupRoot.SetPosition(this.GetPosition());
-            this.popupRoot.PointerPressed += this.MaybeClose;
             this.topLevel.Deactivated += this.MaybeClose;
-
+            this.popupRoot.AddHandler(PopupRoot.PointerPressedEvent, this.MaybeClose, RoutingStrategies.Bubble, true);
             this.topLevel.AddHandler(TopLevel.PointerPressedEvent, this.MaybeClose, RoutingStrategies.Tunnel);
 
             this.popupRoot.Show();
diff --git a/Perspex.Controls/Primitives/ToggleButton.cs b/Perspex.Controls/Primitives/ToggleButton.cs
index ac20992379..2fc4ca30d0 100644
--- a/Perspex.Controls/Primitives/ToggleButton.cs
+++ b/Perspex.Controls/Primitives/ToggleButton.cs
@@ -7,6 +7,7 @@
 namespace Perspex.Controls.Primitives
 {
     using System;
+    using Perspex.Interactivity;
 
     public class ToggleButton : Button
     {
@@ -28,7 +29,7 @@ namespace Perspex.Controls.Primitives
             set { this.SetValue(IsCheckedProperty, value); }
         }
 
-        protected override void OnClick()
+        protected override void OnClick(RoutedEventArgs e)
         {
             this.Toggle();
         }
diff --git a/Perspex.Interactivity/RoutedEvent.cs b/Perspex.Interactivity/RoutedEvent.cs
index 0e35db16da..2a7c04cdd5 100644
--- a/Perspex.Interactivity/RoutedEvent.cs
+++ b/Perspex.Interactivity/RoutedEvent.cs
@@ -133,8 +133,21 @@ namespace Perspex.Interactivity
             RoutingStrategies routes = RoutingStrategies.Direct | RoutingStrategies.Bubble) 
             where TTarget : class
         {
-            var adaptor = (EventHandler<RoutedEventArgs>)((s, e) => handler((TTarget)s)((TEventArgs)e));
-            this.AddClassHandler(typeof(TTarget), adaptor, routes);
+            this.AddClassHandler(typeof(TTarget), (s, e) => ClassHandlerAdapter<TTarget>(s, e, handler), routes);
+        }
+
+        private static void ClassHandlerAdapter<TTarget>(
+            object sender, 
+            RoutedEventArgs e, 
+            Func<TTarget, Action<TEventArgs>> handler) where TTarget : class
+        {
+            var target = sender as TTarget;
+            var args = e as TEventArgs;
+
+            if (target != null && args != null)
+            {
+                handler(target)(args);
+            }
         }
     }
 }