diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html
index 14bfcd6a..3e11d04b 100644
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -61,7 +61,7 @@
         Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>
         % elif plexpy.INSTALL_TYPE == 'snap':
         Update your Snap package or <a href="#" id="updateDismiss">Dismiss</a>
-        % elif plexpy.INSTALL_TYPE in ('windows', 'macos'):
+        % elif plexpy.INSTALL_TYPE == 'macos':
         <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>
         % else:
         <a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>
@@ -341,7 +341,7 @@ ${next.modalIncludes()}
                         msg += 'Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>';
                     } else if (result.install_type === 'snap') {
                         msg += 'Update your Snap package or <a href="#" id="updateDismiss">Dismiss</a>';
-                    } else if (result.install_type === 'windows' || result.install_type === 'macos') {
+                    } else if (result.install_type === 'macos') {
                         msg += '<a href="' + result.release_url + '" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>'
                     } else {
                         msg += '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index b0cd9170..173dd4cf 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -220,7 +220,7 @@
                             <p class="help-block">Check for Tautulli updates periodically.</p>
                         </div>
                         <div id="git_update_options">
-                            % if not plexpy.SNAP and not plexpy.FROZEN:
+                            % if not plexpy.SNAP and not (plexpy.FROZEN and common.PLATFORM == 'Darwin'):
                             <div class="checkbox">
                                 <label>
                                     <input type="checkbox" id="plexpy_auto_update" name="plexpy_auto_update" value="1" ${config['plexpy_auto_update']} ${docker_setting}> Update Automatically ${docker_msg | n}
diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py
index 1d459d56..572c5011 100644
--- a/plexpy/versioncheck.py
+++ b/plexpy/versioncheck.py
@@ -277,6 +277,10 @@ def check_github(scheduler=False, notify=False, use_cache=False):
         if plexpy.PYTHON2:
             logger.warn('Tautulli is running using Python 2. Unable to run automatic update.')
 
+        elif scheduler and plexpy.FROZEN and common.PLATFORM == 'Windows':
+            logger.info('Running automatic update.')
+            plexpy.shutdown(update=True)
+
         elif scheduler and plexpy.CONFIG.PLEXPY_AUTO_UPDATE and \
                 not plexpy.DOCKER and not plexpy.SNAP and not plexpy.FROZEN:
             logger.info('Running automatic update.')
@@ -296,9 +300,13 @@ def update():
     if not plexpy.UPDATE_AVAILABLE:
         return
 
-    if plexpy.INSTALL_TYPE in ('docker', 'snap', 'windows', 'macos'):
+    if plexpy.INSTALL_TYPE in ('docker', 'snap', 'macos'):
         return
 
+    elif plexpy.INSTALL_TYPE == 'windows':
+        logger.info('Calling Windows scheduled task to update Tautulli')
+        subprocess.Popen(['SCHTASKS', '/Run', '/TN', 'TautulliUpdateTask'])
+
     elif plexpy.INSTALL_TYPE == 'git':
         output, err = runGit('pull --ff-only {} {}'.format(plexpy.CONFIG.GIT_REMOTE,
                                                            plexpy.CONFIG.GIT_BRANCH))