diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index 2cfd371a2956..70e13c85b258 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -31,7 +31,4 @@ MOZ_NO_SMART_CARDS=1
 
 MOZ_RAW=1
 
-# use custom widget for html:select
-MOZ_USE_NATIVE_POPUP_WINDOWS=1
-
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
diff --git a/old-configure.in b/old-configure.in
index 696b31c10dff..69d558cb7304 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1490,7 +1490,6 @@ MOZ_UNIVERSALCHARDET=1
 MOZ_XUL=1
 MOZ_ZIPWRITER=1
 MOZ_NO_SMART_CARDS=
-MOZ_USE_NATIVE_POPUP_WINDOWS=
 MOZ_EXCLUDE_HYPHENATION_DICTIONARIES=
 MOZ_SANDBOX=1
 MOZ_BINARY_EXTENSIONS=
@@ -1897,10 +1896,6 @@ for extension in $MOZ_EXTENSIONS; do
     fi
 done
 
-if test -n "$MOZ_USE_NATIVE_POPUP_WINDOWS"; then
-  AC_DEFINE(MOZ_USE_NATIVE_POPUP_WINDOWS)
-fi
-
 # Avoid defining MOZ_ENABLE_CAIRO_FT on Windows platforms because
 # "cairo-ft-font.c" includes <dlfcn.h>, which only exists on posix platforms
 if test -n "$MOZ_TREE_FREETYPE" -a "$OS_TARGET" != WINNT; then
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 2c4d8fa2445e..a30c6b227481 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -2097,3 +2097,9 @@ set_config('ANDROID_PACKAGE_NAME', android_package_name)
 option(env='MOZ_WINCONSOLE', nargs='?',
        help='Whether we can create a console window.')
 set_define('MOZ_WINCONSOLE', True, when=depends('MOZ_WINCONSOLE')(lambda x: x))
+
+option(env='MOZ_USE_NATIVE_POPUP_WINDOWS', default=target_is_android,
+       help='Whether to use native popup windows')
+
+set_define('MOZ_USE_NATIVE_POPUP_WINDOWS', True,
+           when='MOZ_USE_NATIVE_POPUP_WINDOWS')