diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index d911d0307..65fec1900 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -126,7 +126,9 @@ namespace BlackGui
             connect(ui->pb_CopyOver, &QPushButton::pressed, this, &CFlightPlanComponent::copyRemarksConfirmed);
             connect(ui->pb_GetFromGenerator, &QPushButton::pressed, this, &CFlightPlanComponent::copyRemarksConfirmed);
             connect(ui->pb_RemarksGenerator, &QPushButton::clicked, this, &CFlightPlanComponent::currentTabGenerator);
+
             connect(ui->tb_HelpEquipment, &QToolButton::clicked, this, &CFlightPlanComponent::showEquipmentCodesTab);
+            connect(ui->tb_AltitudeDialog, &QToolButton::clicked, this, &CFlightPlanComponent::altitudeDialog);
 
             connect(ui->le_AircraftType, &QLineEdit::editingFinished, this, &CFlightPlanComponent::aircraftTypeChanged);
             connect(ui->le_EquipmentSuffix, &QLineEdit::editingFinished, this, &CFlightPlanComponent::buildPrefixIcaoSuffix);
@@ -532,7 +534,7 @@ namespace BlackGui
 
         void CFlightPlanComponent::loadFlightPlanFromNetwork()
         {
-            if (!sGui->getIContextNetwork() || !sGui->getIContextNetwork()->isConnected())
+            if (!sGui || sGui->isShuttingDown() || !sGui->getIContextNetwork() || !sGui->getIContextNetwork()->isConnected())
             {
                 CLogMessage(this).warning("Cannot load flight plan, network not connected");
                 return;
@@ -786,6 +788,22 @@ namespace BlackGui
             CLogMessage::preformatted(saveMsg);
         }
 
+        void CFlightPlanComponent::altitudeDialog()
+        {
+            if (!m_altitudeDialog)
+            {
+                m_altitudeDialog = new CAltitudeDialog(this);
+            }
+
+            const QDialog::DialogCode ret = static_cast<QDialog::DialogCode>(m_altitudeDialog->exec());
+            if (ret != QDialog::Accepted) { return; }
+
+            if (!m_altitudeDialog->getAltitudeString().isEmpty())
+            {
+                ui->lep_CrusingAltitude->setText(m_altitudeDialog->getAltitudeString());
+            }
+        }
+
         void CFlightPlanComponent::initCompleters()
         {
             if (!sGui || !sGui->hasWebDataServices()) { return; }
diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h
index 4561053cf..a4fcf3bf2 100644
--- a/src/blackgui/components/flightplancomponent.h
+++ b/src/blackgui/components/flightplancomponent.h
@@ -13,6 +13,7 @@
 #define BLACKGUI_COMPONENTS_FLIGHTPLANCOMPONENT_H
 
 #include "blackgui/overlaymessagesframe.h"
+#include "blackgui/components/altitudedialog.h"
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/simulation/data/lastmodel.h"
 #include "blackmisc/simulation/simulatedaircraft.h"
@@ -64,6 +65,7 @@ namespace BlackGui
 
         private:
             QScopedPointer<Ui::CFlightPlanComponent> ui;
+            CAltitudeDialog *m_altitudeDialog = nullptr;
             BlackMisc::Aviation::CFlightPlan m_sentFlightPlan; //!< My flight plan
             BlackMisc::Simulation::CAircraftModel m_model; //!< currently used model
             BlackMisc::CIdentifier m_identifier { "FlightPlanComponent", this }; //!< Flightplan identifier
@@ -177,6 +179,9 @@ namespace BlackGui
 
             //! Update the diretcory settings
             void updateDirectorySettings(const QString &fileOrDirectory);
+
+            //! Altitude dialog
+            void altitudeDialog();
         };
     } // ns
 } // ns
diff --git a/src/blackgui/components/flightplancomponent.ui b/src/blackgui/components/flightplancomponent.ui
index 3da39f4a2..4b6edc085 100644
--- a/src/blackgui/components/flightplancomponent.ui
+++ b/src/blackgui/components/flightplancomponent.ui
@@ -86,7 +86,17 @@
           <property name="spacing">
            <number>4</number>
           </property>
-          <item row="14" column="3">
+          <item row="7" column="0">
+           <widget class="QLabel" name="lbl_DestinationAirport">
+            <property name="text">
+             <string>9. Destination airport</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="15" column="3">
            <widget class="QPushButton" name="pb_Reset">
             <property name="text">
              <string>&amp;Reset</string>
@@ -97,7 +107,7 @@
             </property>
            </widget>
           </item>
-          <item row="14" column="2">
+          <item row="15" column="2">
            <widget class="QPushButton" name="pb_Prefill">
             <property name="text">
              <string>&amp;Prefill</string>
@@ -108,17 +118,7 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="0">
-           <widget class="QLabel" name="lbl_DestinationAirport">
-            <property name="text">
-             <string>9. Destination airport</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="2">
+          <item row="7" column="2">
            <widget class="QLabel" name="lbl_FuelOnBoard">
             <property name="text">
              <string>12. Fuel on board</string>
@@ -128,14 +128,24 @@
             </property>
            </widget>
           </item>
-          <item row="11" column="0">
+          <item row="12" column="1" colspan="3">
+           <widget class="QLineEdit" name="le_LastSent">
+            <property name="readOnly">
+             <bool>true</bool>
+            </property>
+            <property name="placeholderText">
+             <string>sent time will go here (read only)</string>
+            </property>
+           </widget>
+          </item>
+          <item row="12" column="0">
            <widget class="QLabel" name="lbl_LastSent">
             <property name="text">
              <string>Sent</string>
             </property>
            </widget>
           </item>
-          <item row="10" column="0">
+          <item row="11" column="0">
            <widget class="QLabel" name="lbl_PilotsNameAndHomeBase">
             <property name="toolTip">
              <string>pilot's name</string>
@@ -148,66 +158,7 @@
             </property>
            </widget>
           </item>
-          <item row="11" column="1" colspan="3">
-           <widget class="QLineEdit" name="le_LastSent">
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-            <property name="placeholderText">
-             <string>sent time will go here (read only)</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="2">
-           <widget class="QLineEdit" name="le_FuelOnBoard">
-            <property name="inputMask">
-             <string>99:99</string>
-            </property>
-            <property name="text">
-             <string>00:00</string>
-            </property>
-            <property name="maxLength">
-             <number>5</number>
-            </property>
-            <property name="placeholderText">
-             <string>hh:mm e.g. 02:30</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="3">
-           <widget class="QLineEdit" name="le_AlternateAirport">
-            <property name="maxLength">
-             <number>4</number>
-            </property>
-            <property name="placeholderText">
-             <string>ICAO, e.g. EDDF</string>
-            </property>
-           </widget>
-          </item>
-          <item row="7" column="0">
-           <widget class="QLineEdit" name="le_DestinationAirport">
-            <property name="maxLength">
-             <number>4</number>
-            </property>
-            <property name="placeholderText">
-             <string>ICAO, e.g. EDDF</string>
-            </property>
-           </widget>
-          </item>
-          <item row="6" column="1">
-           <widget class="QLabel" name="lbl_EstimatedTimeEnroute">
-            <property name="toolTip">
-             <string>Estimated time enroute</string>
-            </property>
-            <property name="text">
-             <string>10. Est.time enroute</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="12" column="0" colspan="4">
+          <item row="13" column="0" colspan="4">
            <spacer name="vs_ButtonDistance">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -223,7 +174,56 @@
             </property>
            </spacer>
           </item>
-          <item row="10" column="1" colspan="2">
+          <item row="8" column="3">
+           <widget class="QLineEdit" name="le_AlternateAirport">
+            <property name="maxLength">
+             <number>4</number>
+            </property>
+            <property name="placeholderText">
+             <string>ICAO, e.g. EDDF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="2">
+           <widget class="QLineEdit" name="le_FuelOnBoard">
+            <property name="inputMask">
+             <string>99:99</string>
+            </property>
+            <property name="text">
+             <string>00:00</string>
+            </property>
+            <property name="maxLength">
+             <number>5</number>
+            </property>
+            <property name="placeholderText">
+             <string>hh:mm e.g. 02:30</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <widget class="QLineEdit" name="le_DestinationAirport">
+            <property name="maxLength">
+             <number>4</number>
+            </property>
+            <property name="placeholderText">
+             <string>ICAO, e.g. EDDF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLabel" name="lbl_EstimatedTimeEnroute">
+            <property name="toolTip">
+             <string>Estimated time enroute</string>
+            </property>
+            <property name="text">
+             <string>10. Est.time enroute</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="11" column="1" colspan="2">
            <widget class="QLineEdit" name="le_PilotsName">
             <property name="readOnly">
              <bool>true</bool>
@@ -233,7 +233,7 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="3">
+          <item row="7" column="3">
            <widget class="QLabel" name="lbl_AlternateAirport">
             <property name="text">
              <string>13. Alternate airport</string>
@@ -243,7 +243,7 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0" colspan="4">
+          <item row="6" column="0" colspan="4">
            <widget class="QPlainTextEdit" name="pte_Route">
             <property name="maximumSize">
              <size>
@@ -253,7 +253,7 @@
             </property>
            </widget>
           </item>
-          <item row="10" column="3">
+          <item row="11" column="3">
            <widget class="QLineEdit" name="le_PilotsHomeBase">
             <property name="readOnly">
              <bool>true</bool>
@@ -263,6 +263,13 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="2">
+           <widget class="QLineEdit" name="le_AircraftType">
+            <property name="placeholderText">
+             <string>ICAO, e.g. A321</string>
+            </property>
+           </widget>
+          </item>
           <item row="4" column="0" alignment="Qt::AlignBottom">
            <widget class="QLabel" name="lbl_Route">
             <property name="text">
@@ -273,10 +280,13 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="2">
-           <widget class="QLineEdit" name="le_AircraftType">
-            <property name="placeholderText">
-             <string>ICAO, e.g. A321</string>
+          <item row="3" column="2">
+           <widget class="QLabel" name="lbl_TakeOffTimePlanned">
+            <property name="text">
+             <string>6. Departure time</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -290,13 +300,13 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="2">
-           <widget class="QLabel" name="lbl_TakeOffTimePlanned">
-            <property name="text">
-             <string>6. Departure time</string>
+          <item row="9" column="3">
+           <widget class="QPushButton" name="pb_GetFromGenerator">
+            <property name="toolTip">
+             <string>copy from generator page</string>
             </property>
-            <property name="wordWrap">
-             <bool>true</bool>
+            <property name="text">
+             <string>from gen.</string>
             </property>
            </widget>
           </item>
@@ -310,16 +320,6 @@
             </property>
            </widget>
           </item>
-          <item row="8" column="3">
-           <widget class="QPushButton" name="pb_GetFromGenerator">
-            <property name="toolTip">
-             <string>copy from generator page</string>
-            </property>
-            <property name="text">
-             <string>from gen.</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="1">
            <widget class="QLineEdit" name="le_Callsign">
             <property name="maxLength">
@@ -333,17 +333,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
-           <widget class="QLabel" name="lbl_OriginAirport">
-            <property name="text">
-             <string>5. Departure airport</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="1">
+          <item row="9" column="1">
            <widget class="QComboBox" name="cb_VoiceCapabilitiesFirstPage">
             <item>
              <property name="text">
@@ -362,6 +352,16 @@
             </item>
            </widget>
           </item>
+          <item row="3" column="1">
+           <widget class="QLabel" name="lbl_OriginAirport">
+            <property name="text">
+             <string>5. Departure airport</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="3">
            <layout class="QGridLayout" name="gl_EquipmentIcao">
             <item row="0" column="4">
@@ -393,13 +393,10 @@
             </item>
            </layout>
           </item>
-          <item row="2" column="2">
-           <widget class="QLineEdit" name="le_PrefixIcaoSuffix">
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-            <property name="placeholderText">
-             <string>P/ICAO/S</string>
+          <item row="0" column="0">
+           <widget class="QLabel" name="lbl_Type">
+            <property name="text">
+             <string>1. Type</string>
             </property>
            </widget>
           </item>
@@ -416,36 +413,13 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="lbl_Type">
-            <property name="text">
-             <string>1. Type</string>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="3">
-           <widget class="BlackGui::CAltitudeEdit" name="lep_CrusingAltitude"/>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLabel" name="lbl_Callsign">
-            <property name="text">
-             <string>2. Callsign</string>
-            </property>
-            <property name="scaledContents">
-             <bool>false</bool>
-            </property>
-            <property name="wordWrap">
+          <item row="2" column="2">
+           <widget class="QLineEdit" name="le_PrefixIcaoSuffix">
+            <property name="readOnly">
              <bool>true</bool>
             </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QLineEdit" name="le_OriginAirport">
-            <property name="maxLength">
-             <number>4</number>
-            </property>
             <property name="placeholderText">
-             <string>ICAO, e.g. EDDF</string>
+             <string>P/ICAO/S</string>
             </property>
            </widget>
           </item>
@@ -465,6 +439,29 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="le_OriginAirport">
+            <property name="maxLength">
+             <number>4</number>
+            </property>
+            <property name="placeholderText">
+             <string>ICAO, e.g. EDDF</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLabel" name="lbl_Callsign">
+            <property name="text">
+             <string>2. Callsign</string>
+            </property>
+            <property name="scaledContents">
+             <bool>false</bool>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="3">
            <widget class="QLabel" name="lbl_CruiseTrueAirspeed">
             <property name="toolTip">
@@ -478,6 +475,19 @@
             </property>
            </widget>
           </item>
+          <item row="8" column="1">
+           <widget class="QLineEdit" name="le_EstimatedTimeEnroute">
+            <property name="inputMask">
+             <string>99:99</string>
+            </property>
+            <property name="text">
+             <string>00:00</string>
+            </property>
+            <property name="placeholderText">
+             <string>hh:mm e.g. 02:30</string>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="0" colspan="2">
            <widget class="QWidget" name="wi_PrefixButtons" native="true">
             <layout class="QHBoxLayout" name="hl_PrefixButtons">
@@ -526,7 +536,7 @@
             </layout>
            </widget>
           </item>
-          <item row="8" column="2">
+          <item row="9" column="2">
            <widget class="QPushButton" name="pb_RemarksGenerator">
             <property name="toolTip">
              <string>goto generator page</string>
@@ -536,27 +546,7 @@
             </property>
            </widget>
           </item>
-          <item row="7" column="1">
-           <widget class="QLineEdit" name="le_EstimatedTimeEnroute">
-            <property name="inputMask">
-             <string>99:99</string>
-            </property>
-            <property name="text">
-             <string>00:00</string>
-            </property>
-            <property name="placeholderText">
-             <string>hh:mm e.g. 02:30</string>
-            </property>
-           </widget>
-          </item>
-          <item row="8" column="0">
-           <widget class="QLabel" name="lbl_Remarks">
-            <property name="text">
-             <string>11. Remarks</string>
-            </property>
-           </widget>
-          </item>
-          <item row="9" column="0" colspan="4">
+          <item row="10" column="0" colspan="4">
            <widget class="QPlainTextEdit" name="pte_Remarks">
             <property name="maximumSize">
              <size>
@@ -569,7 +559,14 @@
             </property>
            </widget>
           </item>
-          <item row="14" column="0">
+          <item row="9" column="0">
+           <widget class="QLabel" name="lbl_Remarks">
+            <property name="text">
+             <string>11. Remarks</string>
+            </property>
+           </widget>
+          </item>
+          <item row="15" column="0">
            <widget class="QPushButton" name="pb_SaveDisk">
             <property name="toolTip">
              <string>Save to disk</string>
@@ -583,7 +580,7 @@
             </property>
            </widget>
           </item>
-          <item row="14" column="1">
+          <item row="15" column="1">
            <widget class="QPushButton" name="pb_LoadDisk">
             <property name="toolTip">
              <string>Load from disk</string>
@@ -597,38 +594,13 @@
             </property>
            </widget>
           </item>
-          <item row="13" column="3">
+          <item row="14" column="3">
            <widget class="QCheckBox" name="cb_StrictCheck">
             <property name="text">
              <string>strict &amp;check</string>
             </property>
            </widget>
           </item>
-          <item row="13" column="2">
-           <widget class="QPushButton" name="pb_ValidateFlightPlan">
-            <property name="text">
-             <string>&amp;Validate</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../blackmisc/blackmisc.qrc">
-              <normaloff>:/diagona/icons/diagona/icons/abacus.png</normaloff>:/diagona/icons/diagona/icons/abacus.png</iconset>
-            </property>
-           </widget>
-          </item>
-          <item row="13" column="1">
-           <widget class="QPushButton" name="pb_Load">
-            <property name="toolTip">
-             <string>Load flight plan from network</string>
-            </property>
-            <property name="text">
-             <string>Load</string>
-            </property>
-            <property name="icon">
-             <iconset resource="../../blackmisc/blackmisc.qrc">
-              <normaloff>:/diagona/icons/diagona/icons/network-cloud.png</normaloff>:/diagona/icons/diagona/icons/network-cloud.png</iconset>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="0">
            <widget class="QComboBox" name="cb_FlightRule">
             <item>
@@ -643,7 +615,32 @@
             </item>
            </widget>
           </item>
-          <item row="13" column="0">
+          <item row="14" column="1">
+           <widget class="QPushButton" name="pb_Load">
+            <property name="toolTip">
+             <string>Load flight plan from network</string>
+            </property>
+            <property name="text">
+             <string>Load</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../blackmisc/blackmisc.qrc">
+              <normaloff>:/diagona/icons/diagona/icons/network-cloud.png</normaloff>:/diagona/icons/diagona/icons/network-cloud.png</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="2">
+           <widget class="QPushButton" name="pb_ValidateFlightPlan">
+            <property name="text">
+             <string>&amp;Validate</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../blackmisc/blackmisc.qrc">
+              <normaloff>:/diagona/icons/diagona/icons/abacus.png</normaloff>:/diagona/icons/diagona/icons/abacus.png</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="14" column="0">
            <widget class="QPushButton" name="pb_Send">
             <property name="toolTip">
              <string>Send flight plan to network</string>
@@ -657,6 +654,30 @@
             </property>
            </widget>
           </item>
+          <item row="4" column="3">
+           <layout class="QGridLayout" name="gl_CruiseAltitude">
+            <item row="0" column="0">
+             <widget class="BlackGui::CAltitudeEdit" name="lep_CrusingAltitude"/>
+            </item>
+            <item row="0" column="1">
+             <widget class="QToolButton" name="tb_AltitudeDialog">
+              <property name="toolTip">
+               <string>altitude formats</string>
+              </property>
+              <property name="whatsThis">
+               <string>altitude formats</string>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../blackmisc/blackmisc.qrc">
+                <normaloff>:/pastel/icons/pastel/16/help.png</normaloff>:/pastel/icons/pastel/16/help.png</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </item>
        </layout>
@@ -1150,6 +1171,7 @@ p, li { white-space: pre-wrap; }
   <tabstop>le_OriginAirport</tabstop>
   <tabstop>le_TakeOffTimePlanned</tabstop>
   <tabstop>lep_CrusingAltitude</tabstop>
+  <tabstop>tb_AltitudeDialog</tabstop>
   <tabstop>pte_Route</tabstop>
   <tabstop>le_DestinationAirport</tabstop>
   <tabstop>le_EstimatedTimeEnroute</tabstop>