diff --git a/src/apps/diskprobe/ProbeView.cpp b/src/apps/diskprobe/ProbeView.cpp
index c4ce624294..d140940e70 100644
--- a/src/apps/diskprobe/ProbeView.cpp
+++ b/src/apps/diskprobe/ProbeView.cpp
@@ -1252,12 +1252,9 @@ ProbeView::AttachedToWindow()
 	fRedoMenuItem->SetTarget(fDataView);
 	menu->AddSeparatorItem();
 	menu->AddItem(item = new BMenuItem("Copy", new BMessage(B_COPY), 'C', B_COMMAND_KEY));
-	item->SetTarget(fDataView);
 	menu->AddItem(fPasteMenuItem = new BMenuItem("Paste", new BMessage(B_PASTE), 'V', B_COMMAND_KEY));
-	fPasteMenuItem->SetTarget(fDataView);
 	CheckClipboard();
 	menu->AddItem(item = new BMenuItem("Select All", new BMessage(B_SELECT_ALL), 'A', B_COMMAND_KEY));
-	item->SetTarget(fDataView);
 	menu->AddSeparatorItem();
 	menu->AddItem(item = new BMenuItem("Find" B_UTF8_ELLIPSIS, new BMessage(kMsgOpenFindWindow),
 								'F', B_COMMAND_KEY));
diff --git a/src/apps/diskprobe/ProbeWindow.cpp b/src/apps/diskprobe/ProbeWindow.cpp
index 0a29ede70f..70bb203bfb 100644
--- a/src/apps/diskprobe/ProbeWindow.cpp
+++ b/src/apps/diskprobe/ProbeWindow.cpp
@@ -39,6 +39,17 @@ ProbeWindow::MessageReceived(BMessage *message)
 			break;
 		}
 
+		case B_CUT:
+		case B_COPY:
+		case B_PASTE:
+		case B_SELECT_ALL:
+		{
+			BView *view = CurrentFocus();
+			if (view != NULL)
+				view->MessageReceived(message);
+			break;
+		}
+
 		default:
 			BWindow::MessageReceived(message);
 	}