1 files changed, 2 insertions, 2 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java
index fb44f5ee43..542b6e6cf0 100644
--- a/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java
+++ b/lttng/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/dialogs/EnableEventsDialog.java
@@ -334,7 +334,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
         if (fDomain != null) {
             fIsKernel = fDomain.isKernel();
         } else {
-            fIsKernel = true;
+            fIsKernel = fProviderGroup != null ? fProviderGroup.hasKernelProvider() : true;
         }
     }
 
@@ -380,7 +380,7 @@ public class EnableEventsDialog extends Dialog implements IEnableEventsDialog  {
         fUstButton.setText(Messages.TraceControl_UstDisplayName);
         fUstButton.setSelection(!fIsKernel);
 
-        if (fDomain != null) {
+        if ((fDomain != null) || ((fProviderGroup != null) && (!fProviderGroup.hasKernelProvider()))) {
             fKernelButton.setEnabled(false);
             fUstButton.setEnabled(false);
         }