diff --git a/src/airplaywidget.cpp b/src/airplaywidget.cpp
index 819f5b4..b94440a 100644
--- a/src/airplaywidget.cpp
+++ b/src/airplaywidget.cpp
@@ -156,14 +156,13 @@ AirPlayWidget::AirPlayWidget(QWidget *parent)
         setMinimumSize(0, 0);
     });
 
-/* FIXME: this can be handled better, add linux support */
+/* FIXME: this can be handled better, also check for linux */
 #ifdef WIN32
-    bool bonjour = IsBonjourServiceInstalled();
+    bool bonjour = IsBonjourServiceInstalled() == SERVICE_AVAILABLE;
     if (!bonjour) {
         QMessageBox::warning(
             this, "Bonjour Service Not Installed",
-            "Bonjour service is not installed on your system. Please install "
-            "it to enable AirPlay functionality.");
+            "Bonjour service is not available on your system.");
 
         DiagnoseDialog *diagnoseDialog = new DiagnoseDialog();
         diagnoseDialog->show();
diff --git a/src/airplaywidget.h b/src/airplaywidget.h
index e5e625d..ba31674 100644
--- a/src/airplaywidget.h
+++ b/src/airplaywidget.h
@@ -22,6 +22,7 @@
 
 #include "iDescriptor-ui.h"
 #include "qprocessindicator.h"
+#include "service.h"
 #include <QCheckBox>
 #include <QCloseEvent>
 #include <QComboBox>
diff --git a/src/ifusewidget.cpp b/src/ifusewidget.cpp
index b8669cb..0065cc2 100644
--- a/src/ifusewidget.cpp
+++ b/src/ifusewidget.cpp
@@ -130,8 +130,9 @@ void iFuseWidget::setupUI()
     QString defaultMountPath = QDir(homeDir).absoluteFilePath(productType);
     m_mountPathLabel->setText(defaultMountPath);
 
+/* FIXME: this can be handled better, also check for linux */
 #ifdef WIN32
-    if (!IsWinFspInstalled()) {
+    if (IsWinFspInstalled() != SERVICE_AVAILABLE) {
         DiagnoseDialog *diagnoseDialog = new DiagnoseDialog(this);
         diagnoseDialog->setAttribute(Qt::WA_DeleteOnClose);
         diagnoseDialog->show();
@@ -150,6 +151,11 @@ void iFuseWidget::updateDeviceComboBox()
     m_mountButton->setEnabled(true);
 
     for (std::shared_ptr<iDescriptorDevice> device : devices) {
+
+        if (device->deviceInfo.isWireless) {
+            continue; // Skip wireless devices since ifuse only works with USB
+        }
+
         QString displayText =
             QString::fromStdString(device->deviceInfo.productType) + " / " +
             device->udid;
diff --git a/src/ifusewidget.h b/src/ifusewidget.h
index 3082b20..3270483 100644
--- a/src/ifusewidget.h
+++ b/src/ifusewidget.h
@@ -23,6 +23,7 @@
 #include "appcontext.h"
 #include "iDescriptor-ui.h"
 #include "iDescriptor.h"
+#include "service.h"
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDesktopServices>