diff --git a/tabs/receiver.html b/tabs/receiver.html
index b299451a..085c4091 100644
--- a/tabs/receiver.html
+++ b/tabs/receiver.html
@@ -17,12 +17,10 @@
             <tr>
                 <th i18n="receiverRcRate"></th>
                 <th i18n="receiverRcExpo"></th>
-				<th i18n="receiverRcYawExpo"></th>
             </tr>
             <tr>
                 <td><input type="number" name="rate" step="0.01" min="0" max="2.5" /></td>
                 <td><input type="number" name="expo" step="0.01" min="0" max="1" /></td>
-				<td><input type="number" name="yaw_expo" step="0.01" min="0" max="1" /></td>
             </tr>
         </table>
         <div class="rssi_channel_wrapper">
@@ -44,6 +42,16 @@
                 </select>
             </div>
         </div>
+		<div class="yaw_rate">
+		<table class="yaw_rate">
+            <tr>
+				<th i18n="receiverRcYawExpo"></th>
+            </tr>
+            <tr>
+				<td><input type="number" name="yaw_expo" step="0.01" min="0" max="1" /></td>
+            </tr>
+        </table>
+		</div>
     </div>
     <div class="curves">
         <div class="throttle_curve">
diff --git a/tabs/receiver.js b/tabs/receiver.js
index b302c8e2..581933d5 100644
--- a/tabs/receiver.js
+++ b/tabs/receiver.js
@@ -37,10 +37,10 @@ TABS.receiver.initialize = function (callback) {
 
         $('.tunings .rate input[name="rate"]').val(RC_tuning.RC_RATE.toFixed(2));
         $('.tunings .rate input[name="expo"]').val(RC_tuning.RC_EXPO.toFixed(2));
-		$('.tunings .rate input[name="yaw_expo"]').val(RC_tuning.RC_YAW_EXPO.toFixed(2));
+		$('.tunings .yaw_rate input[name="yaw_expo"]').val(RC_tuning.RC_YAW_EXPO.toFixed(2));
         
 		if (semver.lt(CONFIG.apiVersion, "1.10.0")) {
-            $('.tunings .rate input[name="yaw_expo"]').hide();
+            $('.tunings .yaw_rate input[name="yaw_expo"]').hide();
         }
 		
         chrome.storage.local.get('rx_refresh_rate', function (result) {
@@ -273,7 +273,7 @@ TABS.receiver.initialize = function (callback) {
 
             RC_tuning.RC_RATE = parseFloat($('.tunings .rate input[name="rate"]').val());
             RC_tuning.RC_EXPO = parseFloat($('.tunings .rate input[name="expo"]').val());
-			RC_tuning.RC_YAW_EXPO = parseFloat($('.tunings .rate input[name="yaw_expo"]').val());
+			RC_tuning.RC_YAW_EXPO = parseFloat($('.tunings .yaw_rate input[name="yaw_expo"]').val());
 
             // catch rc map
             var RC_MAP_Letters = ['A', 'E', 'R', 'T', '1', '2', '3', '4'];