diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF b/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF
index 752bc028b3d..d9c694fa7dd 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF
+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.debug.core,
  org.eclipse.swt,
  org.eclipse.jface,
  org.eclipse.ui,
- org.eclipse.search;bundle-version="3.4.0"
+ org.eclipse.search;bundle-version="3.4.0",
+ org.eclipse.cdt.debug.ui;bundle-version="6.0.0"
 Eclipse-LazyStart: true
 Bundle-Activator: org.eclipse.cdt.debug.ui.memory.search.MemorySearchPlugin
 Bundle-Vendor: %providerName
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java
index 0b7c0de2f0a..829bbe93051 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java
@@ -13,10 +13,9 @@ package org.eclipse.cdt.debug.ui.memory.search;
 
 import java.util.Properties;
 
+import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IMemoryBlockExtension;
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
-import org.eclipse.debug.internal.ui.views.memory.MemoryView;
 import org.eclipse.debug.ui.memory.IMemoryRendering;
 import org.eclipse.debug.ui.memory.IMemoryRenderingSite;
 import org.eclipse.jface.action.IAction;
@@ -61,7 +60,7 @@ public class FindAction implements IViewActionDelegate {
 				memBlock = (IMemoryBlock) obj;
 			}
 			
-			Shell shell = DebugUIPlugin.getShell();
+			Shell shell = CDebugUIPlugin.getActiveWorkbenchShell();
 			FindReplaceDialog dialog = new FindReplaceDialog(shell, (IMemoryBlockExtension) memBlock, 
 				fView, (Properties) fSearchDialogProperties);
 			if(action.getText().equalsIgnoreCase("Find Next"))
@@ -75,7 +74,8 @@ public class FindAction implements IViewActionDelegate {
 			else
 			{
 				dialog.open();
-				
+
+				// TODO: finish feature?
 				Object results[] = dialog.getResult();
 			}
 		}