diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index bbae163c5..7779aae12 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -17,7 +17,7 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <ApplicationIcon>Images\ILSpy.ico</ApplicationIcon>
     <RunCodeAnalysis>False</RunCodeAnalysis>
-    <StartArguments>/separate</StartArguments>
+    <StartArguments>/separate "C:\temp\decompiled\Mono.Cecil.dll"</StartArguments>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\NRefactory\ICSharpCode.NRefactory.snk</AssemblyOriginatorKeyFile>
     <DelaySign>False</DelaySign>
@@ -28,6 +28,7 @@
     <RegisterForComInterop>False</RegisterForComInterop>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
     <BaseAddress>4194304</BaseAddress>
+    <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/ILSpy/MainWindow.xaml.cs b/ILSpy/MainWindow.xaml.cs
index 832e2b360..25de2d302 100644
--- a/ILSpy/MainWindow.xaml.cs
+++ b/ILSpy/MainWindow.xaml.cs
@@ -270,9 +270,23 @@ namespace ICSharpCode.ILSpy
 				}
 				if (!found) {
 					AvalonEditTextOutput output = new AvalonEditTextOutput();
-					output.Write("Cannot find " + args.NavigateTo);
+					output.Write(string.Format("Cannot find '{0}' in command line specified assemblies.", args.NavigateTo));
 					decompilerTextView.ShowText(output);
 				}
+			} else if (commandLineLoadedAssemblies.Count == 1) {
+				// NavigateTo == null and an assembly was given on the command-line:
+				// Select the newly loaded assembly
+				JumpToReference(commandLineLoadedAssemblies[0].AssemblyDefinition);
+			} else {
+				SharpTreeNode node = FindNodeByPath(sessionSettings.ActiveTreeViewPath, true);
+				if (node != null) {
+					SelectNode(node);
+					
+					// only if not showing the about page, perform the update check:
+					ShowMessageIfUpdatesAvailableAsync(spySettings);
+				} else {
+					AboutPage.Display(decompilerTextView);
+				}
 			}
 			commandLineLoadedAssemblies.Clear(); // clear references once we don't need them anymore
 		}
@@ -297,18 +311,6 @@ namespace ICSharpCode.ILSpy
 			ShowAssemblyList(this.assemblyList);
 			
 			HandleCommandLineArgumentsAfterShowList(App.CommandLineArguments);
-			
-			if (App.CommandLineArguments.NavigateTo == null) {
-				SharpTreeNode node = FindNodeByPath(sessionSettings.ActiveTreeViewPath, true);
-				if (node != null) {
-					SelectNode(node);
-					
-					// only if not showing the about page, perform the update check:
-					ShowMessageIfUpdatesAvailableAsync(spySettings);
-				} else {
-					AboutPage.Display(decompilerTextView);
-				}
-			}
 		}
 		
 		#region Update Check