diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin b/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
index bd489ee989..cb82d46fde 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin
@@ -81,7 +81,7 @@
 		            extensions = "*.sdps"/>
 	</Path>
 	
-	<Path name="/SharpDevelop/Dialogs/OptionsDialog">
+	<Path name="/SharpDevelop/Dialogs/OptionsDialog/ToolsOptions">
 		<DialogPanel id    = "Profiling"
 		             label = "${res:AddIns.Profiler.Options.Title}"
 		             class = "ICSharpCode.Profiler.AddIn.OptionsPanels.General"
diff --git a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml
index aa195f9e4d..f2f42e521c 100644
--- a/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml
+++ b/src/AddIns/Misc/Profiler/Frontend/AddIn/Src/OptionsPanels/GeneralOptionsPanel.xaml
@@ -9,18 +9,20 @@
         Orientation="Vertical">
         <CheckBox Margin="3"
           Name="chkEnableDC"
-          VerticalAlignment="Top"
-          Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.EnableDC}" />
+          VerticalAlignment="Top">
+	      	<TextBlock TextWrapping="Wrap" Text="{sd:Localize AddIns.Profiler.Options.General.DataCollection.EnableDC}" />
+      	</CheckBox>
         <CheckBox Margin="3"
           Name="chkEnableDCAtStartup"
+          VerticalAlignment="Top">
+	      	<TextBlock TextWrapping="Wrap" Text="{sd:Localize AddIns.Profiler.Options.General.DataCollection.EnableDCAtStartup}" />
+        </CheckBox>
+        <Label Margin="3"
+          HorizontalAlignment="Left"
           VerticalAlignment="Top"
-          Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.EnableDCAtStartup}" />
+          Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription}" />
         <StackPanel Margin="3"
           Orientation="Horizontal">
-      	   <Label Margin="3"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Content="{sd:Localize AddIns.Profiler.Options.General.DataCollection.SizeOfStorageDescription}" />
           <Slider Margin="3" Width="100"
             Name="slSharedMemorySize"
             IsDirectionReversed="False"
@@ -33,9 +35,9 @@
             IsSnapToTickEnabled="True"
             VerticalAlignment="Top" />
           <TextBlock Margin="3"
-            HorizontalAlignment="Right"
+            HorizontalAlignment="Left"
             Text="{Binding Value, ElementName=slSharedMemorySize, StringFormat=\{0\} MB}"
-            VerticalAlignment="Top" />
+            VerticalAlignment="Center" />
         </StackPanel>
         <CheckBox Margin="3"
           Name="chkDoNotProfileNetInternals"