diff --git a/src/preferences/input/InputMouse.cpp b/src/preferences/input/InputMouse.cpp
index 6a015e8c21..8cedaa6acc 100644
--- a/src/preferences/input/InputMouse.cpp
+++ b/src/preferences/input/InputMouse.cpp
@@ -139,7 +139,7 @@ InputMouse::MessageReceived(BMessage* message)
 			BHandler *handler;
 			if (message->FindPointer("source",
 				reinterpret_cast<void**>(&handler)) == B_OK) {
-				bool acceptFirstClick = false;
+				bool acceptFirstClick = true;
 				BCheckBox *acceptFirstClickBox =
 					dynamic_cast<BCheckBox*>(handler);
 				if (acceptFirstClickBox)
diff --git a/src/preferences/input/MouseSettings.cpp b/src/preferences/input/MouseSettings.cpp
index 572cb9987c..042203bc3d 100644
--- a/src/preferences/input/MouseSettings.cpp
+++ b/src/preferences/input/MouseSettings.cpp
@@ -26,7 +26,7 @@ static const bigtime_t kDefaultClickSpeed = 500000;
 static const int32 kDefaultMouseSpeed = 65536;
 static const int32 kDefaultMouseType = 3;	// 3 button mouse
 static const int32 kDefaultAccelerationFactor = 65536;
-static const bool kDefaultAcceptFirstClick = false;
+static const bool kDefaultAcceptFirstClick = true;
 
 
 MouseSettings::MouseSettings()
@@ -369,4 +369,4 @@ MouseSettings::SetAcceptFirstClick(bool accept_first_click)
 {
 	set_accept_first_click(accept_first_click);
 	fAcceptFirstClick = accept_first_click;
-}
\ No newline at end of file
+}
diff --git a/src/servers/input/MouseSettings.cpp b/src/servers/input/MouseSettings.cpp
index dca38b7f59..9b21f285bd 100644
--- a/src/servers/input/MouseSettings.cpp
+++ b/src/servers/input/MouseSettings.cpp
@@ -23,7 +23,7 @@ static const bigtime_t kDefaultClickSpeed = 500000;
 static const int32 kDefaultMouseSpeed = 65536;
 static const int32 kDefaultMouseType = 3;	// 3 button mouse
 static const int32 kDefaultAccelerationFactor = 65536;
-static const bool kDefaultAcceptFirstClick = false;
+static const bool kDefaultAcceptFirstClick = true;