diff --git a/plugins/available/osx.plugin.bash b/plugins/available/osx.plugin.bash
index 0d66c2d9..a033bfb0 100644
--- a/plugins/available/osx.plugin.bash
+++ b/plugins/available/osx.plugin.bash
@@ -116,20 +116,65 @@ function list-jvms(){
   example 'list-jvms'
   group 'osx'
 
-  JDKS_DIR="/Library/Java/JavaVirtualMachines"
-  JDKS=( $(ls ${JDKS_DIR}) )
-  JDKS_STATES=()
+  JVMS_DIR="/Library/Java/JavaVirtualMachines"
+  JVMS=( $(ls ${JVMS_DIR}) )
+  JVMS_STATES=()
 
-  # Map state of JDK
-  for (( i = 0; i < ${#JDKS[@]}; i++ )); do
-    if [[ -f "${JDKS_DIR}/${JDKS[$i]}/Contents/Info.plist" ]]; then
-      JDKS_STATES[${i}]=enable
+  # Map state of JVM
+  for (( i = 0; i < ${#JVMS[@]}; i++ )); do
+    if [[ -f "${JVMS_DIR}/${JVMS[$i]}/Contents/Info.plist" ]]; then
+      JVMS_STATES[${i}]=enabled
     else
-      JDKS_STATES[${i}]=disable
+      JVMS_STATES[${i}]=disabled
     fi
-    echo "${i} ${JDKS[$i]} ${JDKS_STATES[$i]}"
+    echo "${i} ${JVMS[$i]} ${JVMS_STATES[$i]}"
   done
 }
 
+
+function pick-default-jvm(){
+  about 'Pick the default Java Virtual Machines in system-wide scope in macOS'
+  example 'pick-default-jvm'
+
+  # Call function for listing
+  list-jvms
+
+  # Declare variables
+  DEFAULT_JVM_DIR=""
+  DEFAULT_JVM=""
+  OPTION=""
+
+  # OPTION for default jdk and set variables
+  while [[ ! "$OPTION" =~ ^[0-9]+$ || OPTION -ge "${#JVMS[@]}" ]]; do
+    read -p "Enter Default JVM: "  OPTION
+    if [[ ! "$OPTION" =~ ^[0-9]+$  ]]; then
+      echo "Please enter a number"
+    fi
+
+    if [[ OPTION -ge "${#JVMS[@]}" ]]; then
+      echo "Please select one of the displayed JVMs"
+    fi
+  done
+
+  DEFAULT_JVM_DIR="${JVMS_DIR}/${JVMS[$OPTION]}"
+  DEFAULT_JVM="${JVMS[$OPTION]}"
+
+  # Disable all jdk
+  for (( i = 0; i < ${#JVMS[@]}; i++ )); do
+    if [[ -f "${JVMS_DIR}/${JVMS[$i]}/Contents/Info.plist" ]]; then
+      sudo mv "${JVMS_DIR}/${JVMS[$i]}/Contents/Info.plist" "${JVMS_DIR}/${JVMS[$i]}/Contents/Info.plist.disable"
+    fi
+  done
+
+  # Enable default jdk
+  if [[ -f "${DEFAULT_JVM_DIR}/Contents/Info.plist.disable" ]]; then
+    sudo mv "${DEFAULT_JVM_DIR}/Contents/Info.plist.disable" "${DEFAULT_JVM_DIR}/Contents/Info.plist"
+    echo "Enabled ${DEFAULT_JVM} as default JVM"
+  fi
+
+  # Unset widely-used variable name
+  unset OPTION
+}
+
 # Make this backwards compatible
 alias pcurl='prevcurl'