diff --git a/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs
index f19bb8f29..e2da8864b 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluencePagePicker.xaml.cs
@@ -20,6 +20,7 @@
  */
 using System;
 using Confluence;
+using System.Collections.Generic;
 
 namespace GreenshotConfluencePlugin {
 	/// <summary>
@@ -29,9 +30,9 @@ namespace GreenshotConfluencePlugin {
 		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluencePagePicker));
 		private ConfluenceUpload confluenceUpload = null;
 
-		public ConfluencePagePicker(ConfluenceUpload confluenceUpload) {
+		public ConfluencePagePicker(ConfluenceUpload confluenceUpload, List<Page> pagesToPick) {
 			this.confluenceUpload = confluenceUpload;
-			this.DataContext = ConfluenceUtils.GetCurrentPages();
+			this.DataContext = pagesToPick;
 			InitializeComponent();
 		}
 		
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml
index 6c200f53b..e30f9ab6e 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml
@@ -17,8 +17,8 @@
 		<Label Grid.Row="0" Grid.Column="0" Content="Space" />
 		<ComboBox Grid.Row="0" Grid.Column="1" Name="SpaceComboBox" ItemsSource="{Binding Path=Spaces}" DisplayMemberPath="Name" SelectedValuePath="Key"/>
         <Label Grid.Row="1" Grid.Column="0" Content="{l:Translate search_text}" />
-		<TextBox Grid.Row="1" Grid.Column="1" Name="searchText" Text="" KeyDown="SearchText_KeyDown"/>
-        <Button Grid.Row="2" Grid.ColumnSpan="2" Name="Search" Content="{l:Translate search}" Click="Search_Click" />
+		<TextBox Grid.Row="1" Grid.Column="1" Name="searchText" Text="" KeyDown="SearchText_KeyDown" TextChanged="searchText_TextChanged"/>
+        <Button Grid.Row="2" Grid.ColumnSpan="2" Name="Search" Content="{l:Translate search}" Click="Search_Click" IsEnabled="False"/>
 		<ListView Grid.Row="3" Grid.ColumnSpan="2" Name="PageListView" SelectionMode="Single" ItemsSource="{Binding Path=Pages}" SelectionChanged="PageListView_SelectionChanged">
 			<ListView.ItemTemplate>
 				<DataTemplate>
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs
index 0ef08b454..44afa6a71 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs
@@ -76,6 +76,7 @@ namespace GreenshotConfluencePlugin {
 		void Search_Click(object sender, RoutedEventArgs e) {
 			doSearch();
 		}
+
 		void doSearch() {
 			string spaceKey = (string)SpaceComboBox.SelectedValue;
 			config.SearchSpaceKey = spaceKey;
@@ -85,15 +86,20 @@ namespace GreenshotConfluencePlugin {
 				pages.Add(page);
 			}
 		}
+
 		void SearchText_KeyDown(object sender, System.Windows.Input.KeyEventArgs e) {
-			if (e.Key == System.Windows.Input.Key.Return) {
+			if (e.Key == System.Windows.Input.Key.Return && Search.IsEnabled) {
         		doSearch();
         		e.Handled = true;
-    		}
+			}
 		}
 		
 		void Page_Loaded(object sender,  System.Windows.RoutedEventArgs e) {
 			SelectionChanged();
 		}
+
+		private void searchText_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e) {
+			Search.IsEnabled = !string.IsNullOrEmpty(searchText.Text);
+		}
 	}
 }
\ No newline at end of file
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml
index 7bdf1542b..aa97142a6 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml
@@ -4,11 +4,11 @@
     xmlns:l="clr-namespace:TranslationByMarkupExtension"
 	Title="{l:Translate upload_menu_item}" Height="640" Width="500" Icon="/GreenshotConfluencePlugin;component/Images/Confluence.ico">
 	<StackPanel>
-		<TabControl >
-            <TabItem Header="{l:Translate open_pages}">
+		<TabControl>
+            <TabItem Header="{l:Translate open_pages}" Name="PickerTab">
 				<Frame NavigationUIVisibility="Hidden" Content="{Binding Path=PickerPage}" Height="500"/>
 			</TabItem>
-            <TabItem Header="{l:Translate search_pages}">
+            <TabItem Header="{l:Translate search_pages}" Name="SearchTab">
 				<Frame NavigationUIVisibility="Hidden" Content="{Binding Path=SearchPage}" Height="500"/>
 			</TabItem>
             <TabItem Header="{l:Translate browse_pages}">
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
index a8c1ca0a1..663731111 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceUpload.xaml.cs
@@ -33,7 +33,10 @@ namespace GreenshotConfluencePlugin {
 		public Page PickerPage {
 			get {
 				if (pickerPage == null) {
-					pickerPage = new ConfluencePagePicker(this);
+					List<Confluence.Page> pages = ConfluenceUtils.GetCurrentPages();
+					if (pages != null && pages.Count > 0) {
+						pickerPage = new ConfluencePagePicker(this, pages);
+					}
 				}
 				return pickerPage;
 			}
@@ -101,6 +104,10 @@ namespace GreenshotConfluencePlugin {
 			InitializeComponent();
 			this.DataContext = this;
 			updateSpaces();
+			if (PickerPage == null) {
+				PickerTab.Visibility = System.Windows.Visibility.Collapsed;
+				SearchTab.IsSelected = true;
+			}
 		}
 		
 		void updateSpaces() {