diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp
index 1d441adb..140dc875 100644
--- a/src/core/UBDisplayManager.cpp
+++ b/src/core/UBDisplayManager.cpp
@@ -146,6 +146,11 @@ void UBDisplayManager::setDisplayWidget(QWidget* pDisplayWidget)
 {
     if(pDisplayWidget && (pDisplayWidget != mDisplayWidget))
     {
+        if (mDisplayWidget)
+        {
+            pDisplayWidget->setGeometry(mDisplayWidget->geometry());
+            pDisplayWidget->setWindowFlags(mDisplayWidget->windowFlags());
+        }
         mDisplayWidget = pDisplayWidget;
 		// !!!! Should be included into Windows after QT recompilation
 #ifdef Q_WS_MAC
diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp
index d6ca56f2..54d9e847 100644
--- a/src/gui/UBTeacherGuideWidget.cpp
+++ b/src/gui/UBTeacherGuideWidget.cpp
@@ -767,8 +767,10 @@ void UBTeacherGuidePageZeroEditionWidget::switchToMode(tUBTGZeroPageMode mode)
         mpLicenceValueLabel->setText(mpLicenceBox->currentText());
         QStringList licenceIconList;
         licenceIconList << ":images/licenses/ccby.png" << ":images/licenses/ccbynd.png" << ":images/licenses/ccbysa.png" << ":images/licenses/ccbync.png" << ":images/licenses/ccbyncnd.png" << ":images/licenses/ccbyncsa.png";
-        if(mpLicenceBox->currentIndex() < 6){
-            mpLicenceIcon->setPixmap(licenceIconList.at(mpLicenceBox->currentIndex()));
+        int licenceBoxCurrentIndex = mpLicenceBox->currentIndex();
+        // -1 is return if there is no values on the box
+        if(licenceBoxCurrentIndex > 0 && licenceBoxCurrentIndex < licenceIconList.count()){
+            mpLicenceIcon->setPixmap(licenceIconList.at(licenceBoxCurrentIndex));
             mpLicenceIcon->show();
         }
         mpLicenceValueLabel->show();