diff --git a/bec_widgets/widgets/device_line_edit/device_line_edit.py b/bec_widgets/widgets/device_line_edit/device_line_edit.py
index 8e713d8a..f9f4ec97 100644
--- a/bec_widgets/widgets/device_line_edit/device_line_edit.py
+++ b/bec_widgets/widgets/device_line_edit/device_line_edit.py
@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from qtpy.QtCore import QSize
+from qtpy.QtCore import QSize, Signal, Slot
 from qtpy.QtWidgets import QCompleter, QLineEdit, QSizePolicy
 
 from bec_widgets.utils.bec_widget import BECWidget
@@ -24,6 +24,8 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
         arg_name: Argument name, can be used for the other widgets which has to call some other function in bec using correct argument names.
     """
 
+    device_selected = Signal(str)
+
     ICON_NAME = "edit_note"
 
     def __init__(
@@ -54,6 +56,18 @@ class DeviceLineEdit(DeviceInputBase, QLineEdit):
         self.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
         self.setMinimumSize(QSize(100, 0))
 
+        self.editingFinished.connect(self.emit_device_selected)
+
+    @Slot()
+    def emit_device_selected(self):
+        """
+        Editing finished, let's see which device is selected and emit signal
+        """
+        device_name = self.text().lower()
+        device_obj = getattr(self.dev, device_name, None)
+        if device_obj is not None:
+            self.device_selected.emit(device_name)
+
     def set_device_filter(self, device_filter: str | list[str]):
         """
         Set the device filter.
diff --git a/bec_widgets/widgets/scan_control/scan_control.py b/bec_widgets/widgets/scan_control/scan_control.py
index 499ce6b2..dee2320e 100644
--- a/bec_widgets/widgets/scan_control/scan_control.py
+++ b/bec_widgets/widgets/scan_control/scan_control.py
@@ -420,6 +420,7 @@ class ScanControl(BECWidget, QWidget):
         Args:
         """
         self.arg_box = ScanGroupBox(box_type="args", config=group)
+        self.arg_box.device_selected.connect(self.emit_device_selected)
         self.arg_box.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed)
         self.layout.addWidget(self.arg_box)
 
diff --git a/bec_widgets/widgets/scan_control/scan_group_box.py b/bec_widgets/widgets/scan_control/scan_group_box.py
index b651a2e5..871a7700 100644
--- a/bec_widgets/widgets/scan_control/scan_group_box.py
+++ b/bec_widgets/widgets/scan_control/scan_group_box.py
@@ -1,7 +1,7 @@
 from typing import Literal
 
 from bec_lib.logger import bec_logger
-from qtpy.QtCore import Qt
+from qtpy.QtCore import Qt, Slot, Signal
 from qtpy.QtWidgets import (
     QCheckBox,
     QComboBox,
@@ -133,6 +133,8 @@ class ScanGroupBox(QGroupBox):
         ScanArgType.LITERALS: QComboBox,  # TODO figure out combobox logic
     }
 
+    device_selected = Signal(str)
+
     def __init__(
         self,
         parent=None,
@@ -148,6 +150,7 @@ class ScanGroupBox(QGroupBox):
         self.layout = QGridLayout(self)
         self.labels = []
         self.widgets = []
+        self.selected_devices = {}
 
         self.init_box(self.config)
 
@@ -192,20 +195,29 @@ class ScanGroupBox(QGroupBox):
         for column_index, item in enumerate(group_inputs):
             arg_name = item.get("name", None)
             default = item.get("default", None)
-            widget = self.WIDGET_HANDLER.get(item["type"], None)
-            if widget is None:
+            widget_class = self.WIDGET_HANDLER.get(item["type"], None)
+            if widget_class is None:
                 logger.error(
                     f"Unsupported annotation '{item['type']}' for parameter '{item['name']}'"
                 )
                 continue
             if default == "_empty":
                 default = None
-            widget_to_add = widget(arg_name=arg_name, default=default)
+            widget = widget_class(arg_name=arg_name, default=default)
+            if isinstance(widget, DeviceLineEdit):
+                self.selected_devices[widget] = ""
+                widget.device_selected.connect(self.emit_device_selected)
             tooltip = item.get("tooltip", None)
             if tooltip is not None:
-                widget_to_add.setToolTip(item["tooltip"])
-            self.layout.addWidget(widget_to_add, row, column_index)
-            self.widgets.append(widget_to_add)
+                widget.setToolTip(item["tooltip"])
+            self.layout.addWidget(widget, row, column_index)
+            self.widgets.append(widget)
+
+    @Slot(str)
+    def emit_device_selected(self, device_name):
+        self.selected_devices[self.sender()] = device_name.strip()
+        selected_devices_str = " ".join(self.selected_devices.values())
+        self.device_selected.emit(selected_devices_str)
 
     def add_widget_bundle(self):
         """