@@ -26,6 +26,11 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
 
+    <Button
+        android:id="@+id/buttonWithButtonArgument"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" />
+
     <Button
         android:id="@+id/snake_case_button"
         android:layout_width="fill_parent"
 
@@ -19,6 +19,7 @@
 import org.androidannotations.annotations.EActivity;
 
 import android.view.View;
+import android.widget.Button;
 
 @EActivity(R.layout.clickable_widgets)
 public class ClicksHandledActivity extends EventsHandledAbstractActivity {
@@ -62,6 +63,11 @@ public void buttonWithViewArgument(View viewArgument) {
 		this.viewArgument = viewArgument;
 	}
 
+	@Click
+	public void buttonWithButtonArgument(Button viewArgument) {
+		this.viewArgument = viewArgument;
+	}
+
 	@Click({ R.id.button1, R.id.button2 })
 	public void multipleButtonWithViewArgument(View viewArgument) {
 		this.viewArgument = viewArgument;
 
@@ -24,7 +24,7 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
-
+import android.widget.Button;
 
 @RunWith(RobolectricTestRunner.class)
 public class ClicksHandledActivityTest {
@@ -98,6 +98,16 @@ public void viewArgumentIsGiven() {
 		assertThat(activity.viewArgument).hasId(R.id.buttonWithViewArgument);
 	}
 
+	@Test
+	public void buttonArgumentIsGiven() {
+		assertThat(activity.viewArgument).isNull();
+
+		Button button = (Button) activity.findViewById(R.id.buttonWithButtonArgument);
+		button.performClick();
+
+		assertThat(activity.viewArgument).isSameAs(button);
+	}
+
 	@Test
 	public void multipleButtonsClicked() {
 		assertThat(activity.multipleButtonsEventHandled).isFalse();