diff --git a/core/debuggercontroller.cpp b/core/debuggercontroller.cpp
index 4fd1226..f7ea167 100644
--- a/core/debuggercontroller.cpp
+++ b/core/debuggercontroller.cpp
@@ -1390,9 +1390,6 @@ DbgRef<DebuggerController> DebuggerController::GetController(BinaryViewRef data)
 			return controller;
 	}
 
-	if (data->GetTypeName() == "Debugger")
-		return nullptr;
-
 	auto controller = new DebuggerController(data);
 	g_debuggerControllers = (DbgRef<DebuggerController>*)realloc(g_debuggerControllers,
 							sizeof(DbgRef<DebuggerController>) * (g_controllerCount + 1));
diff --git a/ui/breakpointswidget.cpp b/ui/breakpointswidget.cpp
index cd9a21b..64d014b 100644
--- a/ui/breakpointswidget.cpp
+++ b/ui/breakpointswidget.cpp
@@ -346,7 +346,8 @@ void DebugBreakpointsWidget::add()
 		return;
 
 	bool isAbsoluteAddress = false;
-	if (view->GetTypeName() == "Debugger")
+	auto controller = DebuggerController::GetController(view);
+	if (controller->IsConnected())
 		isAbsoluteAddress = true;
 
 	if (isAbsoluteAddress)