diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
index ad8a5e20..aebf9460 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
@@ -85,7 +85,10 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
             bssid = if (dialogView.bssid.length() != 0) {
                 MacAddressCompat.fromString(dialogView.bssid.toString())
             } else null).apply {
-        if (!arg.p2pMode) securityType = dialogView.security.selectedItemPosition
+        if (!arg.p2pMode) {
+            securityType = dialogView.security.selectedItemPosition
+            isHiddenSsid = dialogView.hiddenSsid.isChecked
+        }
         if (Build.VERSION.SDK_INT >= 23) {
             val bandOption = dialogView.band.selectedItem as BandOption
             band = bandOption.band
@@ -140,6 +143,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
             }
         } else dialogView.bandWrapper.isGone = true
         if (!arg.readOnly) dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment)
+        if (arg.p2pMode) dialogView.hiddenSsid.isGone = true
         populateFromConfiguration(arg.configuration)
     }
 
@@ -153,6 +157,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
             } else bandOptions.indexOfFirst { it.band == configuration.band })
         }
         dialogView.bssid.setText(configuration.bssid?.toString())
+        dialogView.hiddenSsid.isChecked = configuration.isHiddenSsid
         // TODO support more fields from SACC
     }
 
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index 27357735..f6e3dab2 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -121,6 +121,13 @@
                     android:inputType="textNoSuggestions"
                     android:maxLength="17" />
             </com.google.android.material.textfield.TextInputLayout>
+            <Switch
+                android:id="@+id/hidden_ssid"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip"
+                style="@style/wifi_item_label"
+                android:text="Hidden network"/>
         </LinearLayout>
     </ScrollView>
 </LinearLayout>