diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php
index edf9a62792289..81708df651fda 100644
--- a/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php
+++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php
@@ -228,7 +228,7 @@
 				</table>
 			</td>
 		</tr>
-		<tr id="preupdatecheckbox" >
+		<tr id="preupdatecheckbox">
 			<td>
 				<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_NON_CORE_PLUGIN_CONFIRMATION'); ?>
 			</td>
diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php
index bf5646f669ffb..012b970413c9e 100644
--- a/administrator/components/com_joomlaupdate/views/default/view.html.php
+++ b/administrator/components/com_joomlaupdate/views/default/view.html.php
@@ -103,7 +103,7 @@ public function display($tpl = null)
 		$this->nonCoreExtensions      = $model->getNonCoreExtensions();
 
 		// Disable the critical plugins check for non-major updates.
-		$this->nonCoreCriticalPlugins = false;
+		$this->nonCoreCriticalPlugins = array();
 
 		if (version_compare($this->updateInfo['latest'], '4', '>='))
 		{
@@ -267,8 +267,12 @@ private function checkForSelfUpdate()
 	 */
 	public function shouldDisplayPreUpdateCheck()
 	{
-		return isset($this->updateInfo['object']->downloadurl->_data)
-			&& $this->getModel()->isDatabaseTypeSupported()
-			&& $this->getModel()->isPhpVersionSupported();
+		$nextMinor = JVersion::MAJOR_VERSION . '.' . (JVersion::MINOR_VERSION + 1);
+
+		// Show only when we found a download URL, we have an update and when we update to the next minor or greater.
+		return $this->updateInfo['hasUpdate']
+				&& version_compare($this->updateInfo['latest'], $nextMinor, '>=');
+	}
 	}
 }
+