diff --git a/framework/widgets/Pjax.php b/framework/widgets/Pjax.php
index 5b25b41176..1d7046c895 100644
--- a/framework/widgets/Pjax.php
+++ b/framework/widgets/Pjax.php
@@ -102,8 +102,9 @@ class Pjax extends Widget
 			if ($view->title !== null) {
 				echo Html::tag('title', Html::encode($view->title));
 			}
+		} else {
+			echo Html::beginTag('div', $this->options);
 		}
-		echo Html::beginTag('div', $this->options);
 	}
 
 	/**
@@ -111,9 +112,8 @@ class Pjax extends Widget
 	 */
 	public function run()
 	{
-		echo Html::endTag('div');
-
 		if (!$this->requiresPjax()) {
+			echo Html::endTag('div');
 			$this->registerClientScript();
 			return;
 		}
@@ -152,7 +152,7 @@ class Pjax extends Widget
 	protected function requiresPjax()
 	{
 		$headers = Yii::$app->getRequest()->getHeaders();
-		return $headers->get('X-Pjax') && ($selector = $headers->get('X-Pjax-Container')) === '#' . $this->getId();
+		return $headers->get('X-Pjax') && $headers->get('X-Pjax-Container') === '#' . $this->getId();
 	}
 
 	/**