diff --git a/inc/header.inc.php b/inc/header.inc.php
index 90b4810e..6bf1f328 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -167,6 +167,12 @@ if ($modsForHesk_settings['show_icons']) {
 	      <li><a href="<?php echo HESK_PATH; ?>knowledgebase.php"><i class="fa fa-book" <?php echo $iconDisplay; ?>></i>&nbsp;<?php echo $hesklang['kb_text'] ?></a></li> <?php       } ?>
           <?php include ('custom/header-custom.inc.php'); ?>
         </ul>
+        <?php if ($hesk_settings['can_sel_lang']) { ?>
+            <div class="navbar-form navbar-right" role="search" style="margin-right: 20px; min-width: 80px;">
+                <?php echo hesk_getLanguagesAsFormIfNecessary(); ?>
+            </div>
+        <?php } ?>
+
       </div><!-- /.navbar-collapse -->
     </nav>
 
diff --git a/index.php b/index.php
index 7e559085..2ea4464f 100644
--- a/index.php
+++ b/index.php
@@ -106,16 +106,6 @@ function print_add_ticket()
             <div class="panel panel-default">
                 <div class="panel-heading"><?php echo $hesklang['quick_help']; ?></div>
                 <div class="panel-body">
-                    <?php if ($hesk_settings['can_sel_lang']) { ?>
-                    <div class="row">
-                        <div class="col-md-6 col-xs-12">
-                            <label class="control-label" style="margin-top:8px;"><?php echo $hesklang['changeLanguage']; ?></label>
-                        </div>
-                        <div class="col-md-6 col-xs-12">
-                            <?php echo hesk_getLanguagesAsFormIfNecessary(); ?>
-                        </div>
-                    </div>
-                    <?php } ?>
                     <p><?php echo $hesklang['quick_help_submit_ticket']; ?></p>
                 </div>
             </div>
diff --git a/ticket.php b/ticket.php
index fe6cc0a5..2ac6e220 100644
--- a/ticket.php
+++ b/ticket.php
@@ -212,16 +212,6 @@ require_once(HESK_PATH . 'inc/header.inc.php');
         <div class="panel panel-default">
             <div class="panel-heading"><?php echo $hesklang['quick_help']; ?></div>
             <div class="panel-body">
-                <?php if ($hesk_settings['can_sel_lang']) { ?>
-                <div class="row">
-                    <div class="col-md-6 col-xs-12">
-                        <label class="control-label" style="margin-top:8px;"><?php echo $hesklang['changeLanguage']; ?></label>
-                    </div>
-                    <div class="col-md-6 col-xs-12">
-                        <?php echo hesk_getLanguagesAsFormIfNecessary(); ?>
-                    </div>
-                </div>
-                <?php } ?>
                 <p><?php echo $hesklang['quick_help_ticket']; ?></p>
             </div>
         </div>