diff --git a/public/app/partials/inspector.html b/public/app/partials/inspector.html
index 9187e429613..1b1510090ad 100644
--- a/public/app/partials/inspector.html
+++ b/public/app/partials/inspector.html
@@ -1,21 +1,23 @@
-<div class="modal-body gf-box gf-box-no-margin" ng-controller="InspectCtrl" ng-init="init()">
-	<div class="gf-box-header">
-		<div class="gf-box-title">
-			<i class="fa fa-eye"></i>
+<div class="modal-body" ng-controller="InspectCtrl" ng-init="init()">
+	<div class="modal-header">
+		<h2 class="modal-header-title">
 			Inspector
-		</div>
+		</h2>
 
-		<div ng-model="editor.index" bs-tabs>
-			<div ng-repeat="tab in ['Request', 'Response', 'JS Error']" data-title="{{tab}}">
-			</div>
-		</div>
+		<ul class="gf-tabs">
+			<li class="gf-tabs-item" ng-repeat="tab in ['Request', 'Response', 'JS Error']">
+				<a class="gf-tabs-link" ng-click="editor.index = $index" ng-class="{active: editor.index === $index}">
+					{{::tab}}
+				</a>
+			</li>
+		</ul>
 
-		<button class="gf-box-header-close-btn" ng-click="dismiss();">
+		<a class="modal-header-close" ng-click="dismiss();">
 			<i class="fa fa-remove"></i>
-		</button>
+		</a>
 	</div>
 
-	<div class="gf-box-body">
+	<div class="modal-content">
 
 		<div ng-if="editor.index == 0">
 			<h5 class="section-heading">Request details</h5>