diff --git a/sources/gui/src/mainwidget.cpp b/sources/gui/src/mainwidget.cpp
index 93f4d5c..5fce06f 100644
--- a/sources/gui/src/mainwidget.cpp
+++ b/sources/gui/src/mainwidget.cpp
@@ -94,8 +94,10 @@ void MainWidget::update()
 {
     if (debug) qDebug() << PDEBUG;
 
-    updateMainTab();
-    updateMenuMain();
+    if (mainWindow->currentTab() == 0) {
+        updateMainTab();
+        updateMenuMain();
+    }
 
     if (timer.interval() != 0) return timer.start();
 }
diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp
index 58a2097..1e7d064 100644
--- a/sources/gui/src/mainwindow.cpp
+++ b/sources/gui/src/mainwindow.cpp
@@ -111,6 +111,14 @@ MainWindow::~MainWindow()
 }
 
 
+int MainWindow::currentTab()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    return ui->stackedWidget->currentIndex();
+}
+
+
 Qt::ToolBarArea MainWindow::getToolBarArea()
 {
     if (debug) qDebug() << PDEBUG;
diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h
index 5974233..f17ca40 100644
--- a/sources/gui/src/mainwindow.h
+++ b/sources/gui/src/mainwindow.h
@@ -42,11 +42,12 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0,
+    explicit MainWindow(QWidget *parent = nullptr,
                         const QVariantMap args = QVariantMap(),
-                        QTranslator *qtAppTranslator = 0,
-                        QTranslator *appTranslator = 0);
+                        QTranslator *qtAppTranslator = nullptr,
+                        QTranslator *appTranslator = nullptr);
     ~MainWindow();
+    int currentTab();
     Qt::ToolBarArea getToolBarArea();
     void emitNeedToBeConfigured();
     QStringList printSettings();
diff --git a/sources/gui/src/mobilewidget.ui b/sources/gui/src/mobilewidget.ui
index d835064..c372d42 100644
--- a/sources/gui/src/mobilewidget.ui
+++ b/sources/gui/src/mobilewidget.ui
@@ -89,9 +89,6 @@
            <property name="toolTip">
             <string>The username and password to connect with</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
           </widget>
          </item>
         </layout>
@@ -125,9 +122,6 @@
            <property name="toolTip">
             <string>The access point (apn) to connect on</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
           </widget>
          </item>
         </layout>
diff --git a/sources/gui/src/wifimenuwidget.cpp b/sources/gui/src/wifimenuwidget.cpp
index 5d9d6a9..ed33915 100644
--- a/sources/gui/src/wifimenuwidget.cpp
+++ b/sources/gui/src/wifimenuwidget.cpp
@@ -75,8 +75,10 @@ void WiFiMenuWidget::update()
 {
     if (debug) qDebug() << PDEBUG;
 
-    updateWifiTab();
-    updateMenuWifi();
+    if (mainWindow->currentTab() == 2) {
+        updateWifiTab();
+        updateMenuWifi();
+    }
 
     if (timer.interval() != 0) return timer.start();
 }