diff --git a/src/Avalonia.Controls/TabControl.cs b/src/Avalonia.Controls/TabControl.cs
index 306a9d3e6a..955b29f3f9 100644
--- a/src/Avalonia.Controls/TabControl.cs
+++ b/src/Avalonia.Controls/TabControl.cs
@@ -211,7 +211,8 @@ namespace Avalonia.Controls
         {
             base.OnPointerPressed(e);
 
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && e.Pointer.Type == PointerType.Mouse)
+            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed && 
+                (e.Pointer.Type == PointerType.Mouse || e.Pointer.Type == PointerType.Pen))
             {
                 e.Handled = UpdateSelectionFromEventSource(e.Source);
             }
@@ -219,7 +220,8 @@ namespace Avalonia.Controls
 
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
         {
-            if (e.InitialPressMouseButton == MouseButton.Left && e.Pointer.Type != PointerType.Mouse)
+            if (e.InitialPressMouseButton == MouseButton.Left &&
+                (e.Pointer.Type == PointerType.Mouse || e.Pointer.Type == PointerType.Pen))
             {
                 var container = GetContainerFromEventSource(e.Source);
                 if (container != null
diff --git a/src/Avalonia.Input/IKeyboardDevice.cs b/src/Avalonia.Input/IKeyboardDevice.cs
index b3ea7c5f4f..9506dc36fb 100644
--- a/src/Avalonia.Input/IKeyboardDevice.cs
+++ b/src/Avalonia.Input/IKeyboardDevice.cs
@@ -47,8 +47,6 @@ namespace Avalonia.Input
         MiddleMouseButton = 64,
         XButton1MouseButton = 128,
         XButton2MouseButton = 256,
-        BarrelPenButton = 512,
-        PenEraser = 1024,
         KeyboardMask = Alt | Control | Shift | Meta
     }
 
diff --git a/src/Avalonia.Input/PointerPoint.cs b/src/Avalonia.Input/PointerPoint.cs
index 07ef130fcc..cdfcb8da3a 100644
--- a/src/Avalonia.Input/PointerPoint.cs
+++ b/src/Avalonia.Input/PointerPoint.cs
@@ -101,7 +101,7 @@ namespace Avalonia.Input
         RightButtonReleased,
         XButton1Released,
         XButton2Released,
-        Other,
+        Other
     }
 
     public static class PointerUpdateKindExtensions
diff --git a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs b/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
index c75eb69bfd..d6406121c7 100644
--- a/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
+++ b/src/Avalonia.Input/Raw/RawPointerEventArgs.cs
@@ -22,8 +22,6 @@ namespace Avalonia.Input.Raw
         TouchUpdate,
         TouchEnd,
         TouchCancel,
-        BarrelUp,
-        BarrelDown,
         Magnify,
         Rotate,
         Swipe