diff --git a/src/www/interfaces_gif_edit.php b/src/www/interfaces_gif_edit.php
index b2503416d..5fee828b9 100644
--- a/src/www/interfaces_gif_edit.php
+++ b/src/www/interfaces_gif_edit.php
@@ -140,7 +140,7 @@ include("head.inc");
 <body>
 <script>
   $( document ).ready(function() {
-    hook_ipv4v6('ipv4v6net', 'network-id', '128');
+    hook_ipv4v6('ipv4v6net', 'network-id');
   });
 </script>
 <?php include("fbegin.inc"); ?>
@@ -211,20 +211,18 @@ include("head.inc");
                   <tr>
                     <td><a id="help_for_tunnel-remote-addr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('GIF tunnel remote address') ?></td>
                     <td>
-                      <table class="table table-condensed">
+                      <table style="max-width: 348px">
                         <tr>
                           <td style="width:285px">
                             <input name="tunnel-remote-addr" type="text" id="tunnel-remote-addr" value="<?=$pconfig['tunnel-remote-addr'];?>" />
                           </td>
                           <td>
-                            <select name="tunnel-remote-net" data-network-id="tunnel-remote-addr" class="selectpicker ipv4v6net" data-size="10" id="tunnel-remote-net" data-width="auto">
-<?php
-                            for ($i = 128; $i > 0; $i--):?>
+                            <select name="tunnel-remote-net" data-network-id="tunnel-remote-addr" class="selectpicker ipv4v6net" data-size="10" id="tunnel-remote-net" data-width="70px">
+<?php for ($i = 128; $i > 0; $i--): ?>
                               <option value="<?=$i;?>"  <?=$i == $pconfig['tunnel-remote-net'] ? "selected=\"selected\"" : "";?> >
                                   <?=$i;?>
                               </option>
-<?php
-                            endfor;?>
+<?php endfor ?>
                             </select>
                           </td>
                         </tr>
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index 4d02af8d5..839f009ca 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -110,7 +110,7 @@ include("head.inc");
 <body>
 <script>
   $( document ).ready(function() {
-    hook_ipv4v6('ipv4v6net', 'network-id', '128');
+    hook_ipv4v6('ipv4v6net', 'network-id');
   });
 </script>
 <?php include("fbegin.inc"); ?>
@@ -184,20 +184,18 @@ include("head.inc");
                   <tr>
                     <td><a id="help_for_tunnel-remote-addr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("GRE tunnel remote address");?></td>
                     <td>
-                      <table class="table table-condensed">
+                      <table style="max-width:348px">
                         <tr>
                           <td style="width:285px">
                             <input name="tunnel-remote-addr" type="text" id="tunnel-remote-addr" value="<?=$pconfig['tunnel-remote-addr'];?>" />
                           </td>
                           <td>
-                            <select name="tunnel-remote-net" data-network-id="tunnel-remote-addr" class="selectpicker ipv4v6net" id="tunnel-remote-net" data-width="auto">
-<?php
-                            for ($i = 128; $i > 0; $i--):?>
+                            <select name="tunnel-remote-net" data-network-id="tunnel-remote-addr" class="selectpicker ipv4v6net" id="tunnel-remote-net" data-width="70px">
+<?php for ($i = 128; $i > 0; $i--): ?>
                               <option value="<?=$i;?>"  <?=$i == $pconfig['tunnel-remote-net'] ? "selected=\"selected\"" : "";?> >
                                   <?=$i;?>
                               </option>
-<?php
-                            endfor;?>
+<?php endfor ?>
                             </select>
                           </td>
                         </tr>
