diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 5ca3924..b9fa7b4 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -718,6 +718,8 @@ Public Class frmFormDesigner
     End Function
     Sub SetActiveControlColor()
         CURRENT_CONTROL.BackColor = Color.DarkOrange
+
+        ' Reset Color of all other controls
         For Each inctrl As Control In Me.pnldesigner.Controls
             If inctrl.Name <> CURRENT_CONTROL.Name Then
                 Dim Type As String = inctrl.GetType.ToString
@@ -1126,7 +1128,6 @@ Public Class frmFormDesigner
     ''' </summary>
     ''' <param name="control">Das Control, für das die Eventhandler gesetzt werden sollen</param>
     Private Sub SetMovementHandlers(control As Control)
-        AddHandler control.Click, AddressOf OnControl_Click
         AddHandler control.MouseDown, AddressOf OnControl_MouseDown
         AddHandler control.MouseUp, AddressOf OnControl_MouseUp
         AddHandler control.MouseMove, AddressOf OnControl_MouseMove
@@ -1147,6 +1148,12 @@ Public Class frmFormDesigner
     Private Sub OnControl_MouseUp(sender As Control, e As MouseEventArgs)
         Mouse_IsPressed = False
 
+        ' Ersten Tab anzeigen
+        TabControlEigenschaften.SelectTab(0)
+
+        ' Control Eigenschaften laden
+        LoadControlProperties(sender)
+
         If Mouse_IsMoving Then
             Mouse_IsMoving = False
 
@@ -1171,7 +1178,6 @@ Public Class frmFormDesigner
             End If
 
             Mouse_IsMoving = True
-            Console.WriteLine("Mouse Moving!")
 
             If Mouse_IsPressed Then
                 Cursor = Cursors.Hand
@@ -1235,7 +1241,7 @@ Public Class frmFormDesigner
         Return obj
     End Function
 
-    Private Sub OnControl_Click(sender As Control, e As MouseEventArgs)
+    Private Sub LoadControlProperties(sender As Control)
         Dim props
         Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
         Dim row As DataRow