diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index b80d166b..c7e60806 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -32,6 +32,9 @@
         <property name="currentIndex">
          <number>0</number>
         </property>
+        <property name="usesScrollButtons">
+         <bool>false</bool>
+        </property>
         <widget class="QWidget" name="tabSourceFiles">
          <property name="font">
           <font>
@@ -1057,8 +1060,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>604</width>
-               <height>1091</height>
+               <width>602</width>
+               <height>1088</height>
               </rect>
              </property>
              <layout class="QGridLayout" name="gridLayout_22">
@@ -3149,6 +3152,7 @@
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
   <include location="../res/Icons.qrc"/>
+  <include location="../res/Icons.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/src/Config.h b/src/Config.h
index 2ecec941..93409833 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -24,9 +24,9 @@
  */
 #define VER_LAMEXP_MAJOR				4
 #define VER_LAMEXP_MINOR_HI				0
-#define VER_LAMEXP_MINOR_LO				1
-#define VER_LAMEXP_BUILD				418
-#define VER_LAMEXP_SUFFIX				Final-1
+#define VER_LAMEXP_MINOR_LO				2
+#define VER_LAMEXP_BUILD				421
+#define VER_LAMEXP_SUFFIX				Alpha-1
 
 /*
  * Tools versions
diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 7673072d..c09a28dd 100644
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -680,6 +680,9 @@ void MainWindow::changeEvent(QEvent *e)
 		{
 			ShellIntegration::install();
 		}
+
+		//Force resize, if needed
+		tabPageChanged(tabWidget->currentIndex());
 	}
 }
 
@@ -1230,11 +1233,43 @@ void MainWindow::tabPageChanged(int idx)
 			actions.at(i)->setChecked(true);
 		}
 	}
-	
-	if(idx == tabWidget->indexOf(tabSourceFiles))
+
+	int initialWidth = this->width();
+	int maximumWidth = QApplication::desktop()->width();
+
+	if(this->isVisible())
+	{
+		while(tabWidget->width() < tabWidget->sizeHint().width())
+		{
+			int previousWidth = this->width();
+			this->resize(this->width() + 1, this->height());
+			if(this->frameGeometry().width() >= maximumWidth) break;
+			if(this->width() <= previousWidth) break;
+		}
+	}
+
+	if(idx == tabWidget->indexOf(tabOptions) && scrollArea->widget() && this->isVisible())
+	{
+		QApplication::processEvents();
+		while(scrollArea->viewport()->width() < scrollArea->widget()->width())
+		{
+			int previousWidth = this->width();
+			this->resize(this->width() + 1, this->height());
+			if(this->frameGeometry().width() >= maximumWidth) break;
+			if(this->width() <= previousWidth) break;
+		}
+	}
+	else if(idx == tabWidget->indexOf(tabSourceFiles))
 	{
 		m_dropNoteLabel->setGeometry(0, 0, sourceFileView->width(), sourceFileView->height());
 	}
+
+	if(initialWidth < this->width())
+	{
+		QPoint prevPos = this->pos();
+		int delta = (this->width() - initialWidth) >> 2;
+		move(prevPos.x() - delta, prevPos.y());
+	}
 }
 
 /*