diff --git a/rest_framework/static/rest_framework/css/default.css b/rest_framework/static/rest_framework/css/default.css
index 4e7cbc06b..d806267bc 100644
--- a/rest_framework/static/rest_framework/css/default.css
+++ b/rest_framework/static/rest_framework/css/default.css
@@ -154,6 +154,12 @@ html, body {
     margin-bottom: 0;
 }
 
+.well {
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+}
+
 .well .form-actions {
     padding-bottom: 0;
     margin-bottom: 0;
@@ -168,7 +174,6 @@ html, body {
 }
 
 .nav-tabs > li {
-    margin-bottom: -3px;
     float: right;
 }
 
@@ -184,13 +189,9 @@ html, body {
     background: #f5f5f5;
 }
 
-.tabs-below > .nav-tabs {
-    border-bottom: none !important;
-}
-
-.tabs-below > .nav-tabs > li {
-    margin-bottom: -2px !important;
-    margin-right: 0 !important;
+.tabbable.first-tab-active .tab-content
+{
+    border-top-right-radius: 0;
 }
 
 #footer, #push {
diff --git a/rest_framework/static/rest_framework/js/default.js b/rest_framework/static/rest_framework/js/default.js
index 484a3bdf1..c74829d7d 100644
--- a/rest_framework/static/rest_framework/js/default.js
+++ b/rest_framework/static/rest_framework/js/default.js
@@ -4,4 +4,10 @@ $('.js-tooltip').tooltip({
     delay: 1000
 });
 
-$('.form-switcher a:first').tab('show');
\ No newline at end of file
+$('a[data-toggle="tab"]:first').on('shown', function (e) {
+    $(e.target).parents('.tabbable').addClass('first-tab-active');
+});
+$('a[data-toggle="tab"]:not(:first)').on('shown', function (e) {
+    $(e.target).parents('.tabbable').removeClass('first-tab-active');
+});
+$('.form-switcher a:first').tab('show');