diff --git a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
index 69ea6fd8e0..1296fd83b7 100644
--- a/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
+++ b/src/add-ons/input_server/devices/wacom/MasterServerDevice.cpp
@@ -52,6 +52,7 @@ MasterServerDevice::MasterServerDevice()
 	get_mouse_acceleration(&fAcceleration);
 	get_click_speed(&fDblClickSpeed);
 	_CalculateAccelerationTable();
+	_SearchDevices();
 }
 
 // destructor
@@ -70,12 +71,7 @@ MasterServerDevice::~MasterServerDevice()
 status_t
 MasterServerDevice::InitCheck()
 {
-	input_device_ref device = { (char *)"Wacom Tablets",
-		B_POINTING_DEVICE, (void*)this };
-	input_device_ref* deviceList[2] = { &device, NULL };
-	RegisterDevices(deviceList);
-
-	return B_OK;
+	return BInputServerDevice::InitCheck();
 }
 
 // SystemShuttingDown
@@ -218,6 +214,10 @@ MasterServerDevice::_AddDevice(const char* path)
 			// start device polling only if we're started
 			if (fActive)
 				device->Start();
+			input_device_ref device = { (char *)"Wacom Tablets",
+				B_POINTING_DEVICE, (void*)this };
+			input_device_ref* deviceList[2] = { &device, NULL };
+			RegisterDevices(deviceList);
 		} else {
 	
 			PRINT(("pointing device not added (%s)\n", path));
diff --git a/src/preferences/input/InputWindow.h b/src/preferences/input/InputWindow.h
index 22c0429491..e580123527 100644
--- a/src/preferences/input/InputWindow.h
+++ b/src/preferences/input/InputWindow.h
@@ -48,19 +48,17 @@ class TouchpadView;
 class InputWindow : public BWindow
 {
 public:
-							InputWindow(BRect rect);
+						InputWindow(BRect rect);
 		void				MessageReceived(BMessage* message);
 		void				Show();
 		void				Hide();
-	
+
 		status_t			FindDevice();
 		void				AddDevice(BInputDevice* device);
 private:
 
 	DeviceListView*			fDeviceListView;
-	BCardView*				fCardView;
-	MouseSettings			fSettings;
-	SettingsView*			fSettingsView;
+	BCardView*			fCardView;
 };
 
 #endif /* INPUT_WINDOW_H */