diff --git a/src/preferences/bluetooth/DeviceListItem.cpp b/src/preferences/bluetooth/DeviceListItem.cpp
index 654c937d15..cb8bb8416c 100644
--- a/src/preferences/bluetooth/DeviceListItem.cpp
+++ b/src/preferences/bluetooth/DeviceListItem.cpp
@@ -27,7 +27,7 @@ DeviceListItem::DeviceListItem(BluetoothDevice*	bDevice)
 }	
 
 
-DeviceListItem::DeviceListItem(bdaddr_t	bdaddr,	DeviceClass	dClass,	int32	rssi = 0)
+DeviceListItem::DeviceListItem(bdaddr_t	bdaddr,	DeviceClass	dClass,	int32 rssi)
 				:	BListItem(),				 
 				fDevice(NULL),
 				fAddress(bdaddr),
diff --git a/src/preferences/bluetooth/DeviceListItem.h b/src/preferences/bluetooth/DeviceListItem.h
index c01ca769fa..5a6493fd1b 100644
--- a/src/preferences/bluetooth/DeviceListItem.h
+++ b/src/preferences/bluetooth/DeviceListItem.h
@@ -19,7 +19,7 @@ class DeviceListItem : public BListItem
 {
 	public:
 		DeviceListItem(BluetoothDevice*	bDevice);
-		DeviceListItem(bdaddr_t	bdaddr,	DeviceClass	dClass,	int32	rssi = 0);
+		DeviceListItem(bdaddr_t	bdaddr,	DeviceClass	dClass,	int32 rssi = 0);
 		
 		~DeviceListItem();
 		
diff --git a/src/preferences/bluetooth/InquiryPanel.cpp b/src/preferences/bluetooth/InquiryPanel.cpp
index 28bca24424..697f29c9c2 100644
--- a/src/preferences/bluetooth/InquiryPanel.cpp
+++ b/src/preferences/bluetooth/InquiryPanel.cpp
@@ -184,8 +184,8 @@ InquiryPanel::MessageReceived(BMessage *message)
 		{
 			message->PrintToStream();
 			int32 index = fRemoteList->CurrentSelection(0);
-			DeviceListItem* item = (DeviceListItem*) fRemoteList->ItemAt(index);
-
+			DeviceListItem* item = (DeviceListItem*) fRemoteList->RemoveItem(index);;
+			
 			BMessage message(kMsgAddToRemoteList);
 			message.AddPointer("device", item);
 
diff --git a/src/preferences/bluetooth/RemoteDevicesView.cpp b/src/preferences/bluetooth/RemoteDevicesView.cpp
index 19a516faee..ae977ab3b3 100644
--- a/src/preferences/bluetooth/RemoteDevicesView.cpp
+++ b/src/preferences/bluetooth/RemoteDevicesView.cpp
@@ -118,6 +118,7 @@ RemoteDevicesView::MessageReceived(BMessage *msg)
 			BListItem* device;
 			msg->FindPointer("device", (void**)&device);
 			fDeviceList->AddItem(device);
+			fDeviceList->Invalidate();
 		}
 		break;
 		default: