diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 4c08e48f5..0869ced00 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -126,13 +126,6 @@ class HTMLDisplayHandler
 				$pathInfo = pathinfo($layout_file);
 				$onlyLayoutFile = $pathInfo['filename'];
 
-				if($realLayoutPath === _XE_PATH_ . 'common/tpl/' && $onlyLayoutFile === 'popup_layout')
-				{
-					Context::set('admin_bar', 'false');
-				}
-				// DISABLE ADMIN BAR
-				Context::set('admin_bar', 'false');
-
 				if(__DEBUG__ == 3)
 				{
 					$GLOBALS['__layout_compile_elapsed__'] = getMicroTime() - $start;
diff --git a/common/css/xe.css b/common/css/xe.css
index 46460ea86..1c186ff08 100644
--- a/common/css/xe.css
+++ b/common/css/xe.css
@@ -150,54 +150,6 @@ body>.message {
 	background: #333 url("../../common/img/msg.loading.gif") no-repeat center 15px;
 }
 
-/* Admin Bar */
-#adminBar {
-	z-index: 9999;
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	padding: 0;
-	width: 100%;
-	height: 28px;
-	border-top: 1px solid #eee;
-	border-bottom: 1px solid #eee;
-	font: 12px/28px Arial, Helvetica, sans-serif;
-	color: #fff;
-	overflow: hidden;
-	box-shadow: 0 0 5px #333;
-	background: #666;
-}
-#adminBar>h1 {
-	float: left;
-	margin: 0 10px 0 0;
-	padding: 6px 0 0 10px;
-	line-height: 1;
-	font-size: 12px;
-}
-#adminBar img {
-	vertical-align: top;
-}
-#adminBar>p {
-	margin: 0;
-}
-#adminBar>.admin {
-	float: left;
-}
-#adminBar>.link {
-	float: right;
-	padding: 0 10px 0 0;
-}
-#adminBar a {
-	text-decoration: none;
-	color: #fff;
-}
-#adminBar a:hover,
-#adminBar a:active,
-#adminBar a:focus {
-	text-decoration: underline;
-}
-
 /* Button */
 .btnArea {
 	clear: both;
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 8d3a61feb..b9dcf596e 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -67,7 +67,6 @@ xe.msg_select_menu = "{$lang->msg_select_menu}";
 {@$isAdminKind = true}
 <!--@end-->
 <body{Context::getBodyClass()}>
-<include target="../../modules/admin/tpl/admin_bar.html" cond="$logged_info->is_admin=='Y' && !$isAdminKind && Context::get('current_module_info')->module_type == 'view' && Context::get('admin_bar') != 'false'" />
 {Context::getBodyHeader()}
 {$content}
 {Context::getHtmlFooter()}
@@ -78,48 +77,5 @@ xe.msg_select_menu = "{$lang->msg_select_menu}";
 <block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block><script src="{$js_file['file']}"></script><block cond="$js_file['targetie']"><![endif]--></block>
 </block>
 
-<script cond="$logged_info->is_admin=='Y' && !$isAdminKind && Context::get('current_module_info')->module_type == 'view' && Context::get('admin_bar') != 'false'">
-jQuery(function($){
-	function get_body_margin(position){
-		var margin = $('body').css('margin-' + position);
-		var unit = margin.substr(-2);
-
-		if(unit == 'px'){
-			margin = parseInt(margin);
-		}else{
-			margin = 0;
-		}
-
-		return margin;
-	}
-
-	var height = $('#adminBar').outerHeight();
-	var margin_top = get_body_margin('top');
-	var new_margin_top = margin_top + height;
-
-	$('body').css({
-		'margin-top': new_margin_top + 'px'
-	})
-
-	var $fixed_elements = $('*').filter(function(){
-		if($(this).get(0) == $('#adminBar').get(0)) return false;
-		if($(this).css("position") !== 'fixed') return false;
-
-		var invisible = false;
-		if(!$(this).is(':visible')){
-			invisible = true;
-			$(this).show();
-		}
-		var top = $(this).position().top;
-		if(invisible){
-			$(this).hide();
-		}
-		if(top > height) return false;
-
-		$(this).css('top', top + height);
-		return true;
-	});
-});
-</script>
 </body>
 </html>
diff --git a/modules/admin/tpl/admin_bar.html b/modules/admin/tpl/admin_bar.html
deleted file mode 100644
index 3d6b55fe9..000000000
--- a/modules/admin/tpl/admin_bar.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<nav id="adminBar">
-	<h1><img src="{$favicon_url}" alt="XE" /></h1>
-	<p class="admin"><a href="{getUrl('', 'module','admin')}">ADMIN</a></p>
-	<p class="link"><a href="http://xpressengine.com/" target="_blank">xpressengine.com</a></p>
-</nav>
diff --git a/modules/document/document.view.php b/modules/document/document.view.php
index 3fa97cea5..b922d8778 100644
--- a/modules/document/document.view.php
+++ b/modules/document/document.view.php
@@ -98,9 +98,6 @@ class documentView extends document
 		Context::set('mid',$module_info->mid);
 		Context::set('browser_title',$module_info->browser_title);
 
-		// not show admin bar
-		Context::set('admin_bar', 'false');
-
 		// Select Pop-up layout
 		$this->setLayoutPath('./common/tpl');
 		$this->setLayoutFile('popup_layout');
diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php
index db910c7e4..cbe3edacf 100644
--- a/modules/editor/editor.view.php
+++ b/modules/editor/editor.view.php
@@ -193,7 +193,6 @@ class editorView extends editor
 		}
 
 		Context::set('editor', $editor);
-		Context::set('admin_bar', 'false');
 
 		$this->setLayoutFile('popup_layout');
 		$this->setTemplatePath($this->module_path.'tpl');
diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php
index 07bf8a6bc..178f37a65 100644
--- a/modules/layout/layout.view.php
+++ b/modules/layout/layout.view.php
@@ -230,7 +230,6 @@ class layoutView extends layout
 		// Convert widgets and others
 		$oContext = Context::getInstance();
 		Context::set('layout_tpl', $layout_tpl);
-		Context::set('admin_bar', 'false');
 		$this->setTemplatePath($this->module_path.'tpl');
 		$this->setTemplateFile('layout_preview');
 	}
@@ -372,7 +371,6 @@ class layoutView extends layout
 		// Convert widgets and others
 		$oContext = &Context::getInstance();
 		Context::set('layout_tpl', $layout_tpl);
-		Context::set('admin_bar', 'false');
 		// Delete Temporary Files
 		FileHandler::removeFile($edited_layout_file);
 		$this->setTemplateFile('layout_preview');
diff --git a/modules/module/module.view.php b/modules/module/module.view.php
index fa987e011..862509d36 100644
--- a/modules/module/module.view.php
+++ b/modules/module/module.view.php
@@ -118,7 +118,6 @@ class moduleView extends module
 		}
 		
 		// not show admin bar
-		Context::set('admin_bar', 'false');
 		Context::set('mid_list', $mid_list);
 		Context::set('selected_module', $selected_module);
 		Context::set('selected_mids', $mid_list[$selected_module]->list);
diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php
index 1b5ed9659..226c8a939 100644
--- a/modules/widget/widget.view.php
+++ b/modules/widget/widget.view.php
@@ -117,7 +117,6 @@ class widgetView extends widget
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
 		Context::set('widget_list',$widget_list);
-		Context::set('admin_bar','false');
 		// When there is no widget is selected in the first widget
 		if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
 
@@ -135,7 +134,6 @@ class widgetView extends widget
 		$oWidgetModel = getModel('widget');
 		$widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
 		Context::set('widgetStyle_list',$widgetStyle_list);
-		Context::set('admin_bar','false');
 		// Selected list of widget styles
 		$widgetstyle = Context::get('widgetstyle');
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle);